Bug 1498586 - Add clang-format off to avoid the reformatting of the data structures r=Ehsan
authorSylvestre Ledru <sledru@mozilla.com>
Fri, 12 Oct 2018 20:48:24 +0000
changeset 499390 7807742373e10ebd64db9d8b50d4abf809816cc3
parent 499389 06020ce3e33a83bc1dd1514aac97beacdab1505f
child 499391 ab824c7f0dd9c50b042d620fbe751432e00dec68
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersEhsan
bugs1498586
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1498586 - Add clang-format off to avoid the reformatting of the data structures r=Ehsan Too hard/impossible for the tool to format correctly these structs Differential Revision: https://phabricator.services.mozilla.com/D8569
accessible/atk/nsStateMap.h
accessible/base/ARIAMap.cpp
accessible/ipc/win/handler/AccessibleHandler.cpp
accessible/windows/msaa/nsEventMap.h
browser/components/build/nsModule.cpp
browser/components/shell/nsGNOMEShellService.cpp
docshell/build/nsDocShellModule.cpp
dom/base/nsHTMLContentSerializer.cpp
dom/base/nsTreeSanitizer.cpp
dom/base/nsXMLContentSerializer.cpp
dom/events/UIEvent.cpp
dom/html/nsHTMLDocument.cpp
dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
dom/media/platforms/wmf/DXVA2Manager.cpp
dom/plugins/test/testplugin/nptest.cpp
dom/security/nsCSPParser.cpp
dom/svg/SVGFEColorMatrixElement.cpp
dom/xslt/xslt/txXSLTNumber.cpp
gfx/2d/ShadersD2D.h
gfx/2d/ShadersD2D1.h
intl/uconv/nsTextToSubURI.cpp
intl/unicharutil/util/nsSpecialCasingData.cpp
js/src/builtin/AtomicsObject.cpp
js/src/builtin/DataViewObject.cpp
js/src/builtin/JSON.cpp
js/src/builtin/MapObject.cpp
js/src/builtin/Object.cpp
js/src/builtin/String.cpp
js/src/frontend/TokenStream.cpp
js/src/gc/GC.cpp
js/src/irregexp/NativeRegExpMacroAssembler.cpp
js/src/jsdate.cpp
js/src/jsmath.cpp
js/src/jsnum.cpp
js/src/perf/jsperf.cpp
js/src/util/Unicode.cpp
js/src/vm/JSFunction.cpp
js/src/vm/Printer.cpp
js/src/vm/SelfHosting.cpp
js/src/vm/StringType.cpp
js/xpconnect/src/XPCShellImpl.cpp
layout/base/PresShell.cpp
layout/build/nsContentDLF.h
layout/build/nsLayoutModule.cpp
layout/xul/nsResizerFrame.cpp
media/psshparser/gtest/TestPsshParser.cpp
media/webrtc/signaling/src/media-conduit/VideoStreamFactory.cpp
netwerk/build/nsNetModule.cpp
netwerk/cache/nsDiskCacheDeviceSQL.cpp
netwerk/protocol/http/nsHttpChannel.cpp
xpcom/base/MemoryMapping.cpp
xpcom/build/mach_override.c
xpcom/components/ManifestParser.cpp
xpcom/io/nsLocalFileWin.cpp
xpcom/rust/gtest/bench-collections/Bench.cpp
--- a/accessible/atk/nsStateMap.h
+++ b/accessible/atk/nsStateMap.h
@@ -48,16 +48,17 @@ const AtkStateType kNone = ATK_STATE_INV
 struct AtkStateMap {
   AtkStateType atkState;
   EStateMapEntryType stateMapEntryType;
 };
 
 
 // Map array from cross platform states to ATK states
 static const AtkStateMap gAtkStateMap[] = {                     // Cross Platform States
+  // clang-format off
   { kNone,                                    kMapOpposite },   // states::UNAVAILABLE             = 1 << 0
   { ATK_STATE_SELECTED,                       kMapDirectly },   // states::SELECTED                = 1 << 1
   { ATK_STATE_FOCUSED,                        kMapDirectly },   // states::FOCUSED                 = 1 << 2
   { ATK_STATE_PRESSED,                        kMapDirectly },   // states::PRESSED                 = 1 << 3
   { ATK_STATE_CHECKED,                        kMapDirectly },   // states::CHECKED                 = 1 << 4
   { ATK_STATE_INDETERMINATE,                  kMapDirectly },   // states::MIXED                   = 1 << 5
   { kNone,                                    kMapDirectly },   // states::READONLY                = 1 << 6
   { kNone,                                    kMapDirectly },   // states::HOTTRACKED              = 1 << 7
@@ -97,14 +98,15 @@ static const AtkStateMap gAtkStateMap[] 
   { ATK_STATE_TRANSIENT,                      kMapDirectly },   // states::TRANSIENT               = 1 << 41
   { ATK_STATE_VERTICAL,                       kMapDirectly },   // states::VERTICAL                = 1 << 42
   { ATK_STATE_STALE,                          kMapDirectly },   // states::STALE                   = 1 << 43
   { ATK_STATE_ENABLED,                        kMapDirectly },   // states::ENABLED                 = 1 << 44
   { ATK_STATE_SENSITIVE,                      kMapDirectly },   // states::SENSITIVE               = 1 << 45
   { ATK_STATE_EXPANDABLE,                     kMapDirectly },   // states::EXPANDABLE              = 1 << 46
   { kNone,                                    kMapDirectly },   // states::PINNED                  = 1 << 47
   { ATK_STATE_ACTIVE,                         kMapDirectly }    // states::CURRENT                 = 1 << 48
+  // clang-format on
 };
 
 static const auto gAtkStateMapLen = std::extent<decltype(gAtkStateMap)>::value;
 
 static_assert(((uint64_t) 0x1) << (gAtkStateMapLen - 1) == mozilla::a11y::states::LAST_ENTRY,
               "ATK states map is out of sync with internal states");
--- a/accessible/base/ARIAMap.cpp
+++ b/accessible/base/ARIAMap.cpp
@@ -32,16 +32,17 @@ static const uint32_t kGenericAccType = 
  *  Definition of nsRoleMapEntry contains comments explaining this table.
  *
  *  When no Role enum mapping exists for an ARIA role, the role will be exposed
  *  via the object attribute "xml-roles".
  */
 
 static const nsRoleMapEntry sWAIRoleMaps[] =
 {
+  // clang-format off
   { // alert
     nsGkAtoms::alert,
     roles::ALERT,
     kUseMapRole,
     eNoValue,
     eNoAction,
     eNoLiveAttr,
     eAlert,
@@ -1235,16 +1236,17 @@ static const nsRoleMapEntry sWAIRoleMaps
     eActivateAction, // XXX: should expose second 'expand/collapse' action based
                      // on states
     eNoLiveAttr,
     kGenericAccType,
     kNoReqStates,
     eARIASelectable,
     eARIACheckedMixed
   }
+  // clang-format on
 };
 
 static const nsRoleMapEntry sLandmarkRoleMap = {
   nsGkAtoms::_empty,
   roles::NOTHING,
   kUseNativeRole,
   eNoValue,
   eNoAction,
@@ -1289,16 +1291,17 @@ static const EStateRule sWAIUnivStateMap
 
 struct AttrCharacteristics
 {
   const nsStaticAtom* const attributeName;
   const uint8_t characteristics;
 };
 
 static const AttrCharacteristics gWAIUnivAttrMap[] = {
+  // clang-format off
   {nsGkAtoms::aria_activedescendant,  ATTR_BYPASSOBJ                               },
   {nsGkAtoms::aria_atomic,   ATTR_BYPASSOBJ_IF_FALSE | ATTR_VALTOKEN | ATTR_GLOBAL },
   {nsGkAtoms::aria_busy,                               ATTR_VALTOKEN | ATTR_GLOBAL },
   {nsGkAtoms::aria_checked,           ATTR_BYPASSOBJ | ATTR_VALTOKEN               }, /* exposes checkable obj attr */
   {nsGkAtoms::aria_controls,          ATTR_BYPASSOBJ                 | ATTR_GLOBAL },
   {nsGkAtoms::aria_describedby,       ATTR_BYPASSOBJ                 | ATTR_GLOBAL },
   {nsGkAtoms::aria_details,           ATTR_BYPASSOBJ                 | ATTR_GLOBAL },
   {nsGkAtoms::aria_disabled,          ATTR_BYPASSOBJ | ATTR_VALTOKEN | ATTR_GLOBAL },
@@ -1326,16 +1329,17 @@ static const AttrCharacteristics gWAIUni
   {nsGkAtoms::aria_required,          ATTR_BYPASSOBJ | ATTR_VALTOKEN               },
   {nsGkAtoms::aria_selected,          ATTR_BYPASSOBJ | ATTR_VALTOKEN               },
   {nsGkAtoms::aria_setsize,           ATTR_BYPASSOBJ                               }, /* handled via groupPosition */
   {nsGkAtoms::aria_sort,                               ATTR_VALTOKEN               },
   {nsGkAtoms::aria_valuenow,          ATTR_BYPASSOBJ                               },
   {nsGkAtoms::aria_valuemin,          ATTR_BYPASSOBJ                               },
   {nsGkAtoms::aria_valuemax,          ATTR_BYPASSOBJ                               },
   {nsGkAtoms::aria_valuetext,         ATTR_BYPASSOBJ                               }
+  // clang-format on
 };
 
 namespace {
 
 struct RoleComparator
 {
   const nsDependentSubstring& mRole;
   explicit RoleComparator(const nsDependentSubstring& aRole) : mRole(aRole) {}
--- a/accessible/ipc/win/handler/AccessibleHandler.cpp
+++ b/accessible/ipc/win/handler/AccessibleHandler.cpp
@@ -1294,30 +1294,32 @@ AccessibleHandler::get_selectionRanges(I
   HRESULT hr = ResolveIA2();
   if (FAILED(hr)) {
     return hr;
   }
   return mIA2PassThru->get_selectionRanges(ranges, nRanges);
 }
 
 static const GUID kUnsupportedServices[] = {
+  // clang-format off
   // Unknown, queried by Windows
   {0x33f139ee, 0xe509, 0x47f7, {0xbf, 0x39, 0x83, 0x76, 0x44, 0xf7, 0x45, 0x76}},
   // Unknown, queried by Windows
   {0xFDA075CF, 0x7C8B, 0x498C, { 0xB5, 0x14, 0xA9, 0xCB, 0x52, 0x1B, 0xBF, 0xB4 }},
   // Unknown, queried by Windows
   {0x8EDAA462, 0x21F4, 0x4C87, { 0xA0, 0x12, 0xB3, 0xCD, 0xA3, 0xAB, 0x01, 0xFC }},
   // Unknown, queried by Windows
   {0xacd46652, 0x829d, 0x41cb, { 0xa5, 0xfc, 0x17, 0xac, 0xf4, 0x36, 0x61, 0xac }},
   // SID_IsUIAutomationObject (undocumented), queried by Windows
   {0xb96fdb85, 0x7204, 0x4724, { 0x84, 0x2b, 0xc7, 0x05, 0x9d, 0xed, 0xb9, 0xd0 }},
   // IIS_IsOleaccProxy (undocumented), queried by Windows
   {0x902697FA, 0x80E4, 0x4560, {0x80, 0x2A, 0xA1, 0x3F, 0x22, 0xA6, 0x47, 0x09}},
   // IID_IHTMLElement, queried by JAWS
   {0x3050F1FF, 0x98B5, 0x11CF, {0xBB, 0x82, 0x00, 0xAA, 0x00, 0xBD, 0xCE, 0x0B}}
+  // clang-format on
 };
 
 /*** IServiceProvider ***/
 
 HRESULT
 AccessibleHandler::QueryService(REFGUID aServiceId, REFIID aIid,
                                 void** aOutInterface)
 {
--- a/accessible/windows/msaa/nsEventMap.h
+++ b/accessible/windows/msaa/nsEventMap.h
@@ -6,16 +6,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <winuser.h>
 #include "AccessibleEventId.h"
 
 const uint32_t kEVENT_WIN_UNKNOWN = 0x00000000;
 
 static const uint32_t gWinEventMap[] = {
+  // clang-format off
   kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent doesn't have 0 constant
   EVENT_OBJECT_SHOW,                                 // nsIAccessibleEvent::EVENT_SHOW
   EVENT_OBJECT_HIDE,                                 // nsIAccessibleEvent::EVENT_HIDE
   EVENT_OBJECT_REORDER,                              // nsIAccessibleEvent::EVENT_REORDER
   IA2_EVENT_ACTIVE_DECENDENT_CHANGED,                // nsIAccessibleEvent::EVENT_ACTIVE_DECENDENT_CHANGED
   EVENT_OBJECT_FOCUS,                                // nsIAccessibleEvent::EVENT_FOCUS
   EVENT_OBJECT_STATECHANGE,                          // nsIAccessibleEvent::EVENT_STATE_CHANGE
   EVENT_OBJECT_LOCATIONCHANGE,                       // nsIAccessibleEvent::EVENT_LOCATION_CHANGE
@@ -92,12 +93,13 @@ static const uint32_t gWinEventMap[] = {
   IA2_EVENT_HYPERLINK_NUMBER_OF_ANCHORS_CHANGED,     // nsIAccessibleEvent::EVENT_HYPERLINK_NUMBER_OF_ANCHORS_CHANGED
   IA2_EVENT_HYPERLINK_SELECTED_LINK_CHANGED,         // nsIAccessibleEvent::EVENT_HYPERLINK_SELECTED_LINK_CHANGED
   IA2_EVENT_HYPERTEXT_LINK_ACTIVATED,                // nsIAccessibleEvent::EVENT_HYPERTEXT_LINK_ACTIVATED
   IA2_EVENT_HYPERTEXT_LINK_SELECTED,                 // nsIAccessibleEvent::EVENT_HYPERTEXT_LINK_SELECTED
   IA2_EVENT_HYPERLINK_START_INDEX_CHANGED,           // nsIAccessibleEvent::EVENT_HYPERLINK_START_INDEX_CHANGED
   IA2_EVENT_HYPERTEXT_CHANGED,                       // nsIAccessibleEvent::EVENT_HYPERTEXT_CHANGED
   IA2_EVENT_HYPERTEXT_NLINKS_CHANGED,                // nsIAccessibleEvent::EVENT_HYPERTEXT_NLINKS_CHANGED
   IA2_EVENT_OBJECT_ATTRIBUTE_CHANGED,                // nsIAccessibleEvent::EVENT_OBJECT_ATTRIBUTE_CHANGED
-  kEVENT_WIN_UNKNOWN,                                 // nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED
+  kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent::EVENT_VIRTUALCURSOR_CHANGED
   EVENT_OBJECT_VALUECHANGE,                          // nsIAccessibleEvent::EVENT_TEXT_VALUE_CHANGE
   kEVENT_WIN_UNKNOWN,                                // nsIAccessibleEvent::EVENT_SCROLLING
+  // clang-format on
 };
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -66,16 +66,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
 #elif defined(XP_MACOSX)
 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
 #endif
 #if defined(MOZ_WIDGET_COCOA)
 NS_DEFINE_NAMED_CID(NS_MACATTRIBUTIONSERVICE_CID);
 #endif
 
 static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
+    // clang-format off
     { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
 #if defined(XP_WIN)
     { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor },
 #elif defined(MOZ_WIDGET_GTK)
     { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
 #endif
     { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor },
     { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
@@ -83,19 +84,21 @@ static const mozilla::Module::CIDEntry k
     { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
 #elif defined(XP_MACOSX)
     { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
 #endif
 #if defined(MOZ_WIDGET_COCOA)
     { &kNS_MACATTRIBUTIONSERVICE_CID, false, nullptr, nsMacAttributionServiceConstructor },
 #endif
     { nullptr }
+    // clang-format on
 };
 
 static const mozilla::Module::ContractIDEntry kBrowserContracts[] = {
+    // clang-format off
     { NS_BROWSERDIRECTORYPROVIDER_CONTRACTID, &kNS_BROWSERDIRECTORYPROVIDER_CID },
 #if defined(XP_WIN)
     { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
 #elif defined(MOZ_WIDGET_GTK)
     { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
 #endif
     { NS_FEEDSNIFFER_CONTRACTID, &kNS_FEEDSNIFFER_CID },
     { NS_ABOUT_MODULE_CONTRACTID_PREFIX "blocked", &kNS_BROWSER_ABOUT_REDIRECTOR_CID },
@@ -121,16 +124,17 @@ static const mozilla::Module::ContractID
     { NS_IEHISTORYENUMERATOR_CONTRACTID, &kNS_WINIEHISTORYENUMERATOR_CID },
 #elif defined(XP_MACOSX)
     { NS_SHELLSERVICE_CONTRACTID, &kNS_SHELLSERVICE_CID },
 #endif
 #if defined(MOZ_WIDGET_COCOA)
     { NS_MACATTRIBUTIONSERVICE_CONTRACTID, &kNS_MACATTRIBUTIONSERVICE_CID },
 #endif
     { nullptr }
+    // clang-format on
 };
 
 static const mozilla::Module::CategoryEntry kBrowserCategories[] = {
     { XPCOM_DIRECTORY_PROVIDER_CATEGORY, "browser-directory-provider", NS_BROWSERDIRECTORYPROVIDER_CONTRACTID },
     { NS_CONTENT_SNIFFER_CATEGORY, "Feed Sniffer", NS_FEEDSNIFFER_CONTRACTID },
     { nullptr }
 };
 
--- a/browser/components/shell/nsGNOMEShellService.cpp
+++ b/browser/components/shell/nsGNOMEShellService.cpp
@@ -52,25 +52,29 @@ struct ProtocolAssociation
 
 struct MimeTypeAssociation
 {
   const char *mimeType;
   const char *extensions;
 };
 
 static const ProtocolAssociation appProtocols[] = {
+  // clang-format off
   { "http",   true     },
   { "https",  true     },
   { "ftp",    false },
   { "chrome", false }
+  // clang-format on
 };
 
 static const MimeTypeAssociation appTypes[] = {
+  // clang-format off
   { "text/html",             "htm html shtml" },
   { "application/xhtml+xml", "xhtml xht"      }
+  // clang-format on
 };
 
 // GConf registry key constants
 #define DG_BACKGROUND "/desktop/gnome/background"
 
 #define kDesktopImageKey DG_BACKGROUND "/picture_filename"
 #define kDesktopOptionsKey DG_BACKGROUND "/picture_options"
 #define kDesktopDrawBGKey DG_BACKGROUND "/draw_background"
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -111,16 +111,17 @@ NS_DEFINE_NAMED_CID(NS_DBUSHANDLERAPP_CI
 #endif
 #if defined(MOZ_WIDGET_ANDROID)
 NS_DEFINE_NAMED_CID(NS_EXTERNALURLHANDLERSERVICE_CID);
 #endif
 NS_DEFINE_NAMED_CID(NS_SHENTRY_CID);
 NS_DEFINE_NAMED_CID(NS_CONTENTHANDLERSERVICE_CID);
 
 const mozilla::Module::CIDEntry kDocShellCIDs[] = {
+  // clang-format off
   { &kNS_DOCSHELL_CID, false, nullptr, nsDocShellConstructor },
   { &kNS_DEFAULTURIFIXUP_CID, false, nullptr, nsDefaultURIFixupConstructor },
   { &kNS_WEBNAVIGATION_INFO_CID, false, nullptr, nsWebNavigationInfoConstructor },
   { &kNS_ABOUT_REDIRECTOR_MODULE_CID, false, nullptr, nsAboutRedirector::Create },
   { &kNS_URI_LOADER_CID, false, nullptr, nsURILoaderConstructor },
   { &kNS_DOCUMENTLOADER_SERVICE_CID, false, nullptr, nsDocLoaderConstructor },
   { &kNS_EXTERNALHELPERAPPSERVICE_CID, false, nullptr, nsOSHelperAppServiceConstructor },
   { &kNS_OSPERMISSIONREQUEST_CID, false, nullptr, nsOSPermissionRequestConstructor },
@@ -133,19 +134,21 @@ const mozilla::Module::CIDEntry kDocShel
 #ifdef MOZ_ENABLE_DBUS
   { &kNS_DBUSHANDLERAPP_CID, false, nullptr, nsDBusHandlerAppConstructor },
 #endif
 #if defined(MOZ_WIDGET_ANDROID)
   { &kNS_EXTERNALURLHANDLERSERVICE_CID, false, nullptr, nsExternalURLHandlerServiceConstructor },
 #endif
   { &kNS_SHENTRY_CID, false, nullptr, nsSHEntryConstructor },
   { nullptr }
+  // clang-format on
 };
 
 const mozilla::Module::ContractIDEntry kDocShellContracts[] = {
+  // clang-format off
   { "@mozilla.org/docshell;1", &kNS_DOCSHELL_CID },
   { NS_URIFIXUP_CONTRACTID, &kNS_DEFAULTURIFIXUP_CID },
   { NS_WEBNAVIGATION_INFO_CONTRACTID, &kNS_WEBNAVIGATION_INFO_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "about", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "addons", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "buildconfig", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "checkerboard", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
   { NS_ABOUT_MODULE_CONTRACTID_PREFIX "config", &kNS_ABOUT_REDIRECTOR_MODULE_CID },
@@ -187,16 +190,17 @@ const mozilla::Module::ContractIDEntry k
   { NS_DBUSHANDLERAPP_CONTRACTID, &kNS_DBUSHANDLERAPP_CID },
 #endif
 #if defined(MOZ_WIDGET_ANDROID)
   { NS_EXTERNALURLHANDLERSERVICE_CONTRACTID, &kNS_EXTERNALURLHANDLERSERVICE_CID },
 #endif
   { NS_SHENTRY_CONTRACTID, &kNS_SHENTRY_CID },
   { NS_OSPERMISSIONREQUEST_CONTRACTID, &kNS_OSPERMISSIONREQUEST_CID, mozilla::Module::MAIN_PROCESS_ONLY },
   { nullptr }
+  // clang-format on
 };
 
 static const mozilla::Module kDocShellModule = {
   mozilla::Module::kVersion,
   kDocShellCIDs,
   kDocShellContracts,
   nullptr,
   nullptr,
--- a/dom/base/nsHTMLContentSerializer.cpp
+++ b/dom/base/nsHTMLContentSerializer.cpp
@@ -389,16 +389,17 @@ nsHTMLContentSerializer::AppendElementEn
 }
 
 static const uint16_t kValNBSP = 160;
 
 #define _ 0
 
 // This table indexes into kEntityStrings[].
 static const uint8_t kEntities[] = {
+  // clang-format off
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, 2, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   3, _, 4, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
@@ -406,20 +407,22 @@ static const uint8_t kEntities[] = {
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   5
+  // clang-format on
 };
 
 // This table indexes into kEntityStrings[].
 static const uint8_t kAttrEntities[] = {
+  // clang-format off
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, 1, _, _, _, 2, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   3, _, 4, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
@@ -427,16 +430,17 @@ static const uint8_t kAttrEntities[] = {
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   5
+  // clang-format on
 };
 
 #undef _
 
 static const char* const kEntityStrings[] = {
   /* 0 */ nullptr,
   /* 1 */ "&quot;",
   /* 2 */ "&amp;",
--- a/dom/base/nsTreeSanitizer.cpp
+++ b/dom/base/nsTreeSanitizer.cpp
@@ -29,16 +29,17 @@
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 //
 // Thanks to Mark Pilgrim and Sam Ruby for the initial whitelist
 //
 const nsStaticAtom* const kElementsHTML[] = {
+  // clang-format off
   nsGkAtoms::a,
   nsGkAtoms::abbr,
   nsGkAtoms::acronym,
   nsGkAtoms::address,
   nsGkAtoms::area,
   nsGkAtoms::article,
   nsGkAtoms::aside,
   nsGkAtoms::audio,
@@ -141,19 +142,21 @@ const nsStaticAtom* const kElementsHTML[
   nsGkAtoms::track,
   nsGkAtoms::tt,
   nsGkAtoms::u,
   nsGkAtoms::ul,
   nsGkAtoms::var,
   nsGkAtoms::video,
   nsGkAtoms::wbr,
   nullptr
+  // clang-format on
 };
 
 const nsStaticAtom* const kAttributesHTML[] = {
+  // clang-format off
   nsGkAtoms::abbr,
   nsGkAtoms::accept,
   nsGkAtoms::acceptcharset,
   nsGkAtoms::accesskey,
   nsGkAtoms::action,
   nsGkAtoms::alt,
   nsGkAtoms::as,
   nsGkAtoms::autocomplete,
@@ -249,45 +252,50 @@ const nsStaticAtom* const kAttributesHTM
   nsGkAtoms::target,
   nsGkAtoms::title,
   nsGkAtoms::type,
   nsGkAtoms::usemap,
   nsGkAtoms::value,
   nsGkAtoms::width,
   nsGkAtoms::wrap,
   nullptr
+  // clang-format on
 };
 
 const nsStaticAtom* const kPresAttributesHTML[] = {
+  // clang-format off
   nsGkAtoms::align,
   nsGkAtoms::background,
   nsGkAtoms::bgcolor,
   nsGkAtoms::border,
   nsGkAtoms::cellpadding,
   nsGkAtoms::cellspacing,
   nsGkAtoms::color,
   nsGkAtoms::compact,
   nsGkAtoms::clear,
   nsGkAtoms::hspace,
   nsGkAtoms::noshade,
   nsGkAtoms::pointSize,
   nsGkAtoms::size,
   nsGkAtoms::valign,
   nsGkAtoms::vspace,
   nullptr
+  // clang-format on
 };
 
 const nsStaticAtom* const kURLAttributesHTML[] = {
+  // clang-format off
   nsGkAtoms::action,
   nsGkAtoms::href,
   nsGkAtoms::src,
   nsGkAtoms::longdesc,
   nsGkAtoms::cite,
   nsGkAtoms::background,
   nullptr
+  // clang-format on
 };
 
 const nsStaticAtom* const kElementsSVG[] = {
   nsGkAtoms::a, // a
   nsGkAtoms::circle, // circle
   nsGkAtoms::clipPath, // clipPath
   nsGkAtoms::colorProfile, // color-profile
   nsGkAtoms::cursor, // cursor
@@ -916,22 +924,24 @@ const nsStaticAtom* const kAttributesMat
    nsGkAtoms::type, // type
    nsGkAtoms::voffset_, // voffset
    nsGkAtoms::width, // width
    nsGkAtoms::xref_, // xref
   nullptr
 };
 
 const nsStaticAtom* const kURLAttributesMathML[] = {
+  // clang-format off
   nsGkAtoms::href,
   nsGkAtoms::src,
   nsGkAtoms::cdgroup_,
   nsGkAtoms::altimg_,
   nsGkAtoms::definitionURL_,
   nullptr
+  // clang-format on
 };
 
 nsTreeSanitizer::AtomsTable* nsTreeSanitizer::sElementsHTML = nullptr;
 nsTreeSanitizer::AtomsTable* nsTreeSanitizer::sAttributesHTML = nullptr;
 nsTreeSanitizer::AtomsTable* nsTreeSanitizer::sPresAttributesHTML = nullptr;
 nsTreeSanitizer::AtomsTable* nsTreeSanitizer::sElementsSVG = nullptr;
 nsTreeSanitizer::AtomsTable* nsTreeSanitizer::sAttributesSVG = nullptr;
 nsTreeSanitizer::AtomsTable* nsTreeSanitizer::sElementsMathML = nullptr;
--- a/dom/base/nsXMLContentSerializer.cpp
+++ b/dom/base/nsXMLContentSerializer.cpp
@@ -1176,34 +1176,38 @@ nsXMLContentSerializer::AppendToString(c
 
 
 static const uint16_t kGTVal = 62;
 
 #define _ 0
 
 // This table indexes into kEntityStrings[].
 static const uint8_t kEntities[] = {
+  // clang-format off
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, 2, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   3, _, 4
+  // clang-format on
 };
 
 // This table indexes into kEntityStrings[].
 static const uint8_t kAttrEntities[] = {
+  // clang-format off
   _, _, _, _, _, _, _, _, _, 5,
   6, _, _, 7, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, 1, _, _, _, 2, _,
   _, _, _, _, _, _, _, _, _, _,
   _, _, _, _, _, _, _, _, _, _,
   3, _, 4
+  // clang-format on
 };
 
 #undef _
 
 static const char* const kEntityStrings[] = {
   /* 0 */ nullptr,
   /* 1 */ "&quot;",
   /* 2 */ "&amp;",
--- a/dom/events/UIEvent.cpp
+++ b/dom/events/UIEvent.cpp
@@ -288,29 +288,31 @@ UIEvent::Deserialize(const IPC::Message*
 //     UIEvent::ComputeModifierState(), but if we define them in it,
 //     we fail to build on Mac at calling mozilla::ArrayLength().
 struct ModifierPair
 {
   Modifier modifier;
   const char* name;
 };
 static const ModifierPair kPairs[] = {
+  // clang-format off
   { MODIFIER_ALT,        NS_DOM_KEYNAME_ALT },
   { MODIFIER_ALTGRAPH,   NS_DOM_KEYNAME_ALTGRAPH },
   { MODIFIER_CAPSLOCK,   NS_DOM_KEYNAME_CAPSLOCK },
   { MODIFIER_CONTROL,    NS_DOM_KEYNAME_CONTROL },
   { MODIFIER_FN,         NS_DOM_KEYNAME_FN },
   { MODIFIER_FNLOCK,     NS_DOM_KEYNAME_FNLOCK },
   { MODIFIER_META,       NS_DOM_KEYNAME_META },
   { MODIFIER_NUMLOCK,    NS_DOM_KEYNAME_NUMLOCK },
   { MODIFIER_SCROLLLOCK, NS_DOM_KEYNAME_SCROLLLOCK },
   { MODIFIER_SHIFT,      NS_DOM_KEYNAME_SHIFT },
   { MODIFIER_SYMBOL,     NS_DOM_KEYNAME_SYMBOL },
   { MODIFIER_SYMBOLLOCK, NS_DOM_KEYNAME_SYMBOLLOCK },
   { MODIFIER_OS,         NS_DOM_KEYNAME_OS }
+  // clang-format on
 };
 
 // static
 Modifiers
 UIEvent::ComputeModifierState(const nsAString& aModifiersList)
 {
   if (aModifiersList.IsEmpty()) {
     return 0;
--- a/dom/html/nsHTMLDocument.cpp
+++ b/dom/html/nsHTMLDocument.cpp
@@ -2680,16 +2680,17 @@ struct MidasCommand {
   const char*  incomingCommandString;
   const char*  internalCommandString;
   const char*  internalParamString;
   bool useNewParam;
   bool convertToBoolean;
 };
 
 static const struct MidasCommand gMidasCommandTable[] = {
+  // clang-format off
   { "bold",          "cmd_bold",            "", true,  false },
   { "italic",        "cmd_italic",          "", true,  false },
   { "underline",     "cmd_underline",       "", true,  false },
   { "strikethrough", "cmd_strikethrough",   "", true,  false },
   { "subscript",     "cmd_subscript",       "", true,  false },
   { "superscript",   "cmd_superscript",     "", true,  false },
   { "cut",           "cmd_cut",             "", true,  false },
   { "copy",          "cmd_copy",            "", true,  false },
@@ -2737,35 +2738,38 @@ static const struct MidasCommand gMidasC
 // no editor support to remove alignments right now
   { "justifynone",   "cmd_align",           "", true,  false },
 
 // the following will need special review before being turned on
   { "saveas",        "cmd_saveAs",          "", true,  false },
   { "print",         "cmd_print",           "", true,  false },
 #endif
   { nullptr, nullptr, nullptr, false, false }
+  // clang-format on
 };
 
 #define MidasCommandCount ((sizeof(gMidasCommandTable) / sizeof(struct MidasCommand)) - 1)
 
 static const char* const gBlocks[] = {
+  // clang-format off
   "ADDRESS",
   "BLOCKQUOTE",
   "DD",
   "DIV",
   "DL",
   "DT",
   "H1",
   "H2",
   "H3",
   "H4",
   "H5",
   "H6",
   "P",
   "PRE"
+  // clang-format on
 };
 
 static bool
 ConvertToMidasInternalCommandInner(const nsAString& inCommandID,
                                    const nsAString& inParam,
                                    nsACString& outCommandID,
                                    nsACString& outParam,
                                    bool& outIsBoolean,
--- a/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
+++ b/dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp
@@ -20,16 +20,17 @@ template <int V> class FFmpegDecoderModu
 {
 public:
   static already_AddRefed<PlatformDecoderModule> Create(FFmpegLibWrapper*);
 };
 
 static FFmpegLibWrapper sLibAV;
 
 static const char* sLibs[] = {
+  // clang-format off
 #if defined(XP_DARWIN)
   "libavcodec.58.dylib",
   "libavcodec.57.dylib",
   "libavcodec.56.dylib",
   "libavcodec.55.dylib",
   "libavcodec.54.dylib",
   "libavcodec.53.dylib",
 #else
@@ -38,16 +39,17 @@ static const char* sLibs[] = {
   "libavcodec-ffmpeg.so.57",
   "libavcodec-ffmpeg.so.56",
   "libavcodec.so.57",
   "libavcodec.so.56",
   "libavcodec.so.55",
   "libavcodec.so.54",
   "libavcodec.so.53",
 #endif
+  // clang-format on
 };
 
 /* static */ bool
 FFmpegRuntimeLinker::Init()
 {
   if (sLinkStatus != LinkStatus_INIT) {
     return sLinkStatus == LinkStatus_SUCCEEDED;
   }
--- a/dom/media/platforms/wmf/DXVA2Manager.cpp
+++ b/dom/media/platforms/wmf/DXVA2Manager.cpp
@@ -44,16 +44,17 @@ const GUID MF_XVP_PLAYBACK_MODE =
 };
 
 DEFINE_GUID(MF_LOW_LATENCY,
   0x9c27891a, 0xed7a, 0x40e1, 0x88, 0xe8, 0xb2, 0x27, 0x27, 0xa0, 0x24, 0xee);
 
 // R600, R700, Evergreen and Cayman AMD cards. These support DXVA via UVD3 or earlier, and don't
 // handle 1080p60 well.
 static const DWORD sAMDPreUVD4[] = {
+  // clang-format off
   0x9400, 0x9401, 0x9402, 0x9403, 0x9405, 0x940a, 0x940b, 0x940f, 0x94c0, 0x94c1, 0x94c3, 0x94c4, 0x94c5,
   0x94c6, 0x94c7, 0x94c8, 0x94c9, 0x94cb, 0x94cc, 0x94cd, 0x9580, 0x9581, 0x9583, 0x9586, 0x9587, 0x9588,
   0x9589, 0x958a, 0x958b, 0x958c, 0x958d, 0x958e, 0x958f, 0x9500, 0x9501, 0x9504, 0x9505, 0x9506, 0x9507,
   0x9508, 0x9509, 0x950f, 0x9511, 0x9515, 0x9517, 0x9519, 0x95c0, 0x95c2, 0x95c4, 0x95c5, 0x95c6, 0x95c7,
   0x95c9, 0x95cc, 0x95cd, 0x95ce, 0x95cf, 0x9590, 0x9591, 0x9593, 0x9595, 0x9596, 0x9597, 0x9598, 0x9599,
   0x959b, 0x9610, 0x9611, 0x9612, 0x9613, 0x9614, 0x9615, 0x9616, 0x9710, 0x9711, 0x9712, 0x9713, 0x9714,
   0x9715, 0x9440, 0x9441, 0x9442, 0x9443, 0x9444, 0x9446, 0x944a, 0x944b, 0x944c, 0x944e, 0x9450, 0x9452,
   0x9456, 0x945a, 0x945b, 0x945e, 0x9460, 0x9462, 0x946a, 0x946b, 0x947a, 0x947b, 0x9480, 0x9487, 0x9488,
@@ -68,20 +69,22 @@ static const DWORD sAMDPreUVD4[] = {
   0x6738, 0x6739, 0x673e, 0x6740, 0x6741, 0x6742, 0x6743, 0x6744, 0x6745, 0x6746, 0x6747, 0x6748, 0x6749,
   0x674a, 0x6750, 0x6751, 0x6758, 0x6759, 0x675b, 0x675d, 0x675f, 0x6840, 0x6841, 0x6842, 0x6843, 0x6849,
   0x6850, 0x6858, 0x6859, 0x6760, 0x6761, 0x6762, 0x6763, 0x6764, 0x6765, 0x6766, 0x6767, 0x6768, 0x6770,
   0x6771, 0x6772, 0x6778, 0x6779, 0x677b, 0x6700, 0x6701, 0x6702, 0x6703, 0x6704, 0x6705, 0x6706, 0x6707,
   0x6708, 0x6709, 0x6718, 0x6719, 0x671c, 0x671d, 0x671f, 0x9900, 0x9901, 0x9903, 0x9904, 0x9905, 0x9906,
   0x9907, 0x9908, 0x9909, 0x990a, 0x990b, 0x990c, 0x990d, 0x990e, 0x990f, 0x9910, 0x9913, 0x9917, 0x9918,
   0x9919, 0x9990, 0x9991, 0x9992, 0x9993, 0x9994, 0x9995, 0x9996, 0x9997, 0x9998, 0x9999, 0x999a, 0x999b,
   0x999c, 0x999d, 0x99a0, 0x99a2, 0x99a4
+  // clang-format on
 };
 
 // List of NVidia Telsa GPU known to have broken NV12 rendering.
 static const DWORD sNVIDIABrokenNV12[] = {
+  // clang-format off
   0x0191, 0x0193, 0x0194, 0x0197, 0x019d, 0x019e, // G80
   0x0400, 0x0401, 0x0402, 0x0403, 0x0404, 0x0405, 0x0406, 0x0407, 0x0408, 0x0409, // G84
   0x040a, 0x040b, 0x040c, 0x040d, 0x040e, 0x040f,
   0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, // G86
   0x042a, 0x042b, 0x042c, 0x042d, 0x042e, 0x042f,
   0x0410, 0x0600, 0x0601, 0x0602, 0x0603, 0x0604, 0x0605, 0x0606, 0x0607, 0x0608, // G92
   0x0609, 0x060a, 0x060b, 0x060c, 0x060f, 0x0610, 0x0611, 0x0612, 0x0613, 0x0614,
   0x0615, 0x0617, 0x0618, 0x0619, 0x061a, 0x061b, 0x061c, 0x061d, 0x061e, 0x061f, // G94
@@ -101,16 +104,17 @@ static const DWORD sNVIDIABrokenNV12[] =
   0x0876, 0x087a, 0x087d, 0x087e, 0x087f,
   0x0ca0, 0x0ca2, 0x0ca3, 0x0ca2, 0x0ca4, 0x0ca5, 0x0ca7, 0x0ca9, 0x0cac, 0x0caf, // GT215
   0x0cb0, 0x0cb1, 0x0cbc,
   0x0a20, 0x0a22, 0x0a23, 0x0a26, 0x0a27, 0x0a28, 0x0a29, 0x0a2a, 0x0a2b, 0x0a2c, // GT216
   0x0a2d, 0x0a32, 0x0a34, 0x0a35, 0x0a38, 0x0a3c,
   0x0a60, 0x0a62, 0x0a63, 0x0a64, 0x0a65, 0x0a66, 0x0a67, 0x0a68, 0x0a69, 0x0a6a, // GT218
   0x0a6c, 0x0a6e, 0x0a6f, 0x0a70, 0x0a71, 0x0a72, 0x0a73, 0x0a74, 0x0a75, 0x0a76,
   0x0a78, 0x0a7a, 0x0a7c, 0x10c0, 0x10c3, 0x10c5, 0x10d8
+  // clang-format on
 };
 
 // The size we use for our synchronization surface.
 // 16x16 is the size recommended by Microsoft (in the D3D9ExDXGISharedSurf sample) that works
 // best to avoid driver bugs.
 static const uint32_t kSyncSurfaceSize = 16;
 
 namespace mozilla {
--- a/dom/plugins/test/testplugin/nptest.cpp
+++ b/dom/plugins/test/testplugin/nptest.cpp
@@ -353,23 +353,25 @@ static bool sIdentifiersInitialized = fa
 struct timerEvent {
   int32_t timerIdReceive;
   int32_t timerIdSchedule;
   uint32_t timerInterval;
   bool timerRepeat;
   int32_t timerIdUnschedule;
 };
 static timerEvent timerEvents[] = {
+  // clang-format off
   {-1, 0, 200, false, -1},
   {0, 0, 400, false, -1},
   {0, 0, 200, true, -1},
   {0, 1, 400, true, -1},
   {0, -1, 0, false, 0},
   {1, -1, 0, false, -1},
   {1, -1, 0, false, 1},
+  // clang-format on
 };
 static uint32_t currentTimerEventCount = 0;
 static uint32_t totalTimerEvents = sizeof(timerEvents) / sizeof(timerEvent);
 
 /**
  * Incremented for every startWatchingInstanceCount.
  */
 static int32_t sCurrentInstanceCountWatchGeneration = 0;
--- a/dom/security/nsCSPParser.cpp
+++ b/dom/security/nsCSPParser.cpp
@@ -27,16 +27,17 @@ GetCspParserLog()
 {
   static LazyLogModule gCspParserPRLog("CSPParser");
   return gCspParserPRLog;
 }
 
 #define CSPPARSERLOG(args) MOZ_LOG(GetCspParserLog(), mozilla::LogLevel::Debug, args)
 #define CSPPARSERLOGENABLED() MOZ_LOG_TEST(GetCspParserLog(), mozilla::LogLevel::Debug)
 
+// clang-format off
 static const char16_t COLON        = ':';
 static const char16_t SEMICOLON    = ';';
 static const char16_t SLASH        = '/';
 static const char16_t PLUS         = '+';
 static const char16_t DASH         = '-';
 static const char16_t DOT          = '.';
 static const char16_t UNDERLINE    = '_';
 static const char16_t TILDE        = '~';
@@ -47,16 +48,17 @@ static const char16_t QUESTIONMARK = '?'
 static const char16_t PERCENT_SIGN = '%';
 static const char16_t EXCLAMATION  = '!';
 static const char16_t DOLLAR       = '$';
 static const char16_t AMPERSAND    = '&';
 static const char16_t OPENBRACE    = '(';
 static const char16_t CLOSINGBRACE = ')';
 static const char16_t EQUALS       = '=';
 static const char16_t ATSYMBOL     = '@';
+// clang-format on
 
 static const uint32_t kSubHostPathCharacterCutoff = 512;
 
 static const char *const kHashSourceValidFns [] = { "sha256", "sha384", "sha512" };
 static const uint32_t kHashSourceValidFnsLen = 3;
 
 static const char* const kStyle    = "style";
 static const char* const kScript   = "script";
--- a/dom/svg/SVGFEColorMatrixElement.cpp
+++ b/dom/svg/SVGFEColorMatrixElement.cpp
@@ -95,21 +95,24 @@ SVGFEColorMatrixElement::GetPrimitiveDes
   const SVGNumberList &values = mNumberListAttributes[VALUES].GetAnimValue();
 
   ColorMatrixAttributes atts;
   if (!mNumberListAttributes[VALUES].IsExplicitlySet() &&
       (type == SVG_FECOLORMATRIX_TYPE_MATRIX ||
        type == SVG_FECOLORMATRIX_TYPE_SATURATE ||
        type == SVG_FECOLORMATRIX_TYPE_HUE_ROTATE)) {
     atts.mType = (uint32_t)SVG_FECOLORMATRIX_TYPE_MATRIX;
-    static const float identityMatrix[] =
-      { 1, 0, 0, 0, 0,
+    static const float identityMatrix[] = {
+      // clang-format off
+        1, 0, 0, 0, 0,
         0, 1, 0, 0, 0,
         0, 0, 1, 0, 0,
-        0, 0, 0, 1, 0 };
+        0, 0, 0, 1, 0
+      // clang-format on
+    };
     atts.mValues.AppendElements(identityMatrix, 20);
   } else {
     atts.mType = type;
     if (values.Length()) {
       atts.mValues.AppendElements(&values[0], values.Length());
     }
   }
 
--- a/dom/xslt/xslt/txXSLTNumber.cpp
+++ b/dom/xslt/xslt/txXSLTNumber.cpp
@@ -465,16 +465,17 @@ struct CharRange {
     bool operator<(const CharRange& other) const {
         return upper < other.lower;
     }
 };
 
 bool txXSLTNumber::isAlphaNumeric(char16_t ch)
 {
     static const CharRange alphanumericRanges[] = {
+        // clang-format off
         { 0x0030, 0x0039 },
         { 0x0041, 0x005A },
         { 0x0061, 0x007A },
         { 0x00AA, 0x00AA },
         { 0x00B2, 0x00B3 },
         { 0x00B5, 0x00B5 },
         { 0x00B9, 0x00BA },
         { 0x00BC, 0x00BE },
@@ -755,16 +756,17 @@ bool txXSLTNumber::isAlphaNumeric(char16
         { 0xFE76, 0xFEFC },
         { 0xFF10, 0xFF19 },
         { 0xFF21, 0xFF3A },
         { 0xFF41, 0xFF5A },
         { 0xFF66, 0xFFBE },
         { 0xFFC2, 0xFFC7 },
         { 0xFFCA, 0xFFCF },
         { 0xFFD2, 0xFFD7 }
+        // clang-format on
     };
 
     CharRange search = { ch, ch };
     const CharRange* end = mozilla::ArrayEnd(alphanumericRanges);
     const CharRange* element = std::lower_bound(&alphanumericRanges[0], end, search);
     if (element == end) {
         return false;
     }
--- a/gfx/2d/ShadersD2D.h
+++ b/gfx/2d/ShadersD2D.h
@@ -4230,16 +4230,17 @@ technique10 SampleTextTexture
     }
 
 }
 
 #endif
 
 const BYTE d2deffect[] =
 {
+     // clang-format off
      68,  88,  66,  67, 116, 210, 
     237,  43,  26, 169, 147,  99, 
      62,  90, 128, 241, 238, 193, 
     236, 181,   1,   0,   0,   0, 
     242,  19,   1,   0,   1,   0, 
       0,   0,  36,   0,   0,   0, 
      70,  88,  49,  48, 198,  19, 
       1,   0,   1,  16, 255, 254, 
@@ -16004,9 +16005,10 @@ const BYTE d2deffect[] =
       0,   0,   0,   0,   0,   0, 
       7,   0,   0,   0, 146,   1, 
       1,   0,   8,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0, 154,   1,   1,   0, 
       7,   0,   0,   0,   0,   0, 
       0,   0,   7,   0,   0,   0, 
      54,   7,   1,   0
+     // clang-format on
 };
--- a/gfx/2d/ShadersD2D1.h
+++ b/gfx/2d/ShadersD2D1.h
@@ -176,16 +176,17 @@ mul r1.xyzw, r1.xyzw, r2.xyzw
 mul r1.xyzw, r0.zzzz, r1.xyzw
 mul o0.xyzw, r0.yyyy, r1.xyzw
 ret 
 // Approximately 49 instruction slots used
 #endif
 
 const BYTE SampleRadialGradientPS[] =
 {
+    // clang-format off
      68,  88,  66,  67,  20, 173, 
     189, 124, 239,   6,  22,  67, 
     226,  55, 243,  56,  30, 182, 
     172,  36,   1,   0,   0,   0, 
     180,  13,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     136,   3,   0,   0, 232,   9, 
       0,   0, 100,  10,   0,   0, 
@@ -761,16 +762,17 @@ const BYTE SampleRadialGradientPS[] =
       0,   0,   1,   0,   0,   0, 
       8,   0,   0,   0,  32,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   3,   0, 
       0,   0,   0,   0,   0,   0, 
      15,   0,   0,   0,  83,  86, 
      95,  84,  97, 114, 103, 101, 
     116,   0, 171, 171
+    // clang-format on
 };
 #if 0
 //
 // Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
 //
 //
 // Buffer Definitions: 
 //
@@ -921,16 +923,17 @@ sample r2.xyzw, v2.xyxx, t0.xyzw, s0
 mul r1.xyzw, r1.xyzw, r2.xyzw
 mul o0.xyzw, r0.xxxx, r1.xyzw
 ret 
 // Approximately 36 instruction slots used
 #endif
 
 const BYTE SampleRadialGradientA0PS[] =
 {
+    // clang-format off
      68,  88,  66,  67,  47, 105, 
     118, 126,   8, 122, 228, 233, 
      56,  98,  50, 148, 135,  10, 
      63, 196,   1,   0,   0,   0, 
     120,  11,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     212,   2,   0,   0, 172,   7, 
       0,   0,  40,   8,   0,   0, 
@@ -1411,9 +1414,10 @@ const BYTE SampleRadialGradientA0PS[] =
       1,   0,   0,   0,   8,   0, 
       0,   0,  32,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   3,   0,   0,   0, 
       0,   0,   0,   0,  15,   0, 
       0,   0,  83,  86,  95,  84, 
      97, 114, 103, 101, 116,   0, 
     171, 171
+    // clang-format on
 };
--- a/intl/uconv/nsTextToSubURI.cpp
+++ b/intl/uconv/nsTextToSubURI.cpp
@@ -14,32 +14,34 @@
 
 using namespace mozilla;
 
 // Fallback value for the pref "network.IDN.blacklist_chars".
 // UnEscapeURIForUI allows unescaped space; other than that, this is
 // the same as the default "network.IDN.blacklist_chars" value.
 static const char16_t sNetworkIDNBlacklistChars[] =
 {
+  // clang-format off
 /*0x0020,*/
           0x00A0, 0x00BC, 0x00BD, 0x00BE, 0x01C3, 0x02D0, 0x0337,
   0x0338, 0x0589, 0x058A, 0x05C3, 0x05F4, 0x0609, 0x060A, 0x066A, 0x06D4,
   0x0701, 0x0702, 0x0703, 0x0704, 0x115F, 0x1160, 0x1735, 0x2000,
   0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008,
   0x2009, 0x200A, 0x200B, 0x200E, 0x200F, 0x2010, 0x2019, 0x2024, 0x2027, 0x2028,
   0x2029, 0x202A, 0x202B, 0x202C, 0x202D, 0x202E, 0x202F, 0x2039,
   0x203A, 0x2041, 0x2044, 0x2052, 0x205F, 0x2153, 0x2154, 0x2155,
   0x2156, 0x2157, 0x2158, 0x2159, 0x215A, 0x215B, 0x215C, 0x215D,
   0x215E, 0x215F, 0x2215, 0x2236, 0x23AE, 0x2571, 0x29F6, 0x29F8,
   0x2AFB, 0x2AFD, 0x2FF0, 0x2FF1, 0x2FF2, 0x2FF3, 0x2FF4, 0x2FF5,
   0x2FF6, 0x2FF7, 0x2FF8, 0x2FF9, 0x2FFA, 0x2FFB, /*0x3000,*/ 0x3002,
   0x3014, 0x3015, 0x3033, 0x30A0, 0x3164, 0x321D, 0x321E, 0x33AE, 0x33AF,
   0x33C6, 0x33DF, 0xA789, 0xFE14, 0xFE15, 0xFE3F, 0xFE5D, 0xFE5E,
   0xFEFF, 0xFF0E, 0xFF0F, 0xFF61, 0xFFA0, 0xFFF9, 0xFFFA, 0xFFFB,
   0xFFFC, 0xFFFD
+  // clang-format on
 };
 
 nsTextToSubURI::~nsTextToSubURI()
 {
 }
 
 NS_IMPL_ISUPPORTS(nsTextToSubURI, nsITextToSubURI)
 
--- a/intl/unicharutil/util/nsSpecialCasingData.cpp
+++ b/intl/unicharutil/util/nsSpecialCasingData.cpp
@@ -10,20 +10,23 @@
 #include <stdlib.h>       // for bsearch
 
 /* SpecialCasing-11.0.0.txt */
 /* Date: 2018-02-22, 06:16:47 GMT */
 
 using mozilla::unicode::MultiCharMapping;
 
 static const MultiCharMapping CaseSpecials_Lower[] = {
+  // clang-format off
   { 0x0130, {0x0069, 0x0307, 0x0000} }, // LATIN CAPITAL LETTER I WITH DOT ABOVE
+  // clang-format on
 };
 
 static const MultiCharMapping CaseSpecials_Upper[] = {
+  // clang-format off
   { 0x00df, {0x0053, 0x0053, 0x0000} }, // LATIN SMALL LETTER SHARP S
   { 0x0149, {0x02bc, 0x004e, 0x0000} }, // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
   { 0x01f0, {0x004a, 0x030c, 0x0000} }, // LATIN SMALL LETTER J WITH CARON
   { 0x0390, {0x03aa, 0x0301, 0x0000} }, // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
   { 0x03b0, {0x03ab, 0x0301, 0x0000} }, // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
   { 0x0587, {0x0535, 0x0552, 0x0000} }, // ARMENIAN SMALL LIGATURE ECH YIWN
   { 0x1e96, {0x0048, 0x0331, 0x0000} }, // LATIN SMALL LETTER H WITH LINE BELOW
   { 0x1e97, {0x0054, 0x0308, 0x0000} }, // LATIN SMALL LETTER T WITH DIAERESIS
@@ -116,19 +119,21 @@ static const MultiCharMapping CaseSpecia
   { 0xfb04, {0x0046, 0x0046, 0x004c} }, // LATIN SMALL LIGATURE FFL
   { 0xfb05, {0x0053, 0x0054, 0x0000} }, // LATIN SMALL LIGATURE LONG S T
   { 0xfb06, {0x0053, 0x0054, 0x0000} }, // LATIN SMALL LIGATURE ST
   { 0xfb13, {0x0544, 0x0546, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN NOW
   { 0xfb14, {0x0544, 0x0535, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN ECH
   { 0xfb15, {0x0544, 0x053b, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN INI
   { 0xfb16, {0x054e, 0x0546, 0x0000} }, // ARMENIAN SMALL LIGATURE VEW NOW
   { 0xfb17, {0x0544, 0x053d, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN XEH
+  // clang-format on
 };
 
 static const MultiCharMapping CaseSpecials_Title[] = {
+  // clang-format off
   { 0x00df, {0x0053, 0x0073, 0x0000} }, // LATIN SMALL LETTER SHARP S
   { 0x0149, {0x02bc, 0x004e, 0x0000} }, // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE
   { 0x01f0, {0x004a, 0x030c, 0x0000} }, // LATIN SMALL LETTER J WITH CARON
   { 0x0390, {0x03aa, 0x0301, 0x0000} }, // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
   { 0x03b0, {0x03ab, 0x0301, 0x0000} }, // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS
   { 0x0587, {0x0535, 0x0582, 0x0000} }, // ARMENIAN SMALL LIGATURE ECH YIWN
   { 0x1e96, {0x0048, 0x0331, 0x0000} }, // LATIN SMALL LETTER H WITH LINE BELOW
   { 0x1e97, {0x0054, 0x0308, 0x0000} }, // LATIN SMALL LETTER T WITH DIAERESIS
@@ -167,16 +172,17 @@ static const MultiCharMapping CaseSpecia
   { 0xfb04, {0x0046, 0x0066, 0x006c} }, // LATIN SMALL LIGATURE FFL
   { 0xfb05, {0x0053, 0x0074, 0x0000} }, // LATIN SMALL LIGATURE LONG S T
   { 0xfb06, {0x0053, 0x0074, 0x0000} }, // LATIN SMALL LIGATURE ST
   { 0xfb13, {0x0544, 0x0576, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN NOW
   { 0xfb14, {0x0544, 0x0565, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN ECH
   { 0xfb15, {0x0544, 0x056b, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN INI
   { 0xfb16, {0x054e, 0x0576, 0x0000} }, // ARMENIAN SMALL LIGATURE VEW NOW
   { 0xfb17, {0x0544, 0x056d, 0x0000} }, // ARMENIAN SMALL LIGATURE MEN XEH
+  // clang-format on
 };
 
 static int CompareMCM(const void* aKey, const void* aElement)
 {
   const uint32_t ch = *static_cast<const uint32_t*>(aKey);
   const MultiCharMapping* mcm = static_cast<const MultiCharMapping*>(aElement);
   return int(ch) - int(mcm->mOriginalChar);
 }
--- a/js/src/builtin/AtomicsObject.cpp
+++ b/js/src/builtin/AtomicsObject.cpp
@@ -1011,30 +1011,32 @@ js::FutexThread::notify(NotifyReason rea
         break;
       default:
         MOZ_CRASH("bad NotifyReason in FutexThread::notify()");
     }
     cond_->notify_all();
 }
 
 const JSFunctionSpec AtomicsMethods[] = {
+    // clang-format off
     JS_INLINABLE_FN("compareExchange",    atomics_compareExchange,    4,0, AtomicsCompareExchange),
     JS_INLINABLE_FN("load",               atomics_load,               2,0, AtomicsLoad),
     JS_INLINABLE_FN("store",              atomics_store,              3,0, AtomicsStore),
     JS_INLINABLE_FN("exchange",           atomics_exchange,           3,0, AtomicsExchange),
     JS_INLINABLE_FN("add",                atomics_add,                3,0, AtomicsAdd),
     JS_INLINABLE_FN("sub",                atomics_sub,                3,0, AtomicsSub),
     JS_INLINABLE_FN("and",                atomics_and,                3,0, AtomicsAnd),
     JS_INLINABLE_FN("or",                 atomics_or,                 3,0, AtomicsOr),
     JS_INLINABLE_FN("xor",                atomics_xor,                3,0, AtomicsXor),
     JS_INLINABLE_FN("isLockFree",         atomics_isLockFree,         1,0, AtomicsIsLockFree),
     JS_FN("wait",                         atomics_wait,               4,0),
     JS_FN("notify",                       atomics_notify,             3,0),
     JS_FN("wake",                         atomics_notify,             3,0), // Legacy name
     JS_FS_END
+    // clang-format on
 };
 
 JSObject*
 AtomicsObject::initClass(JSContext* cx, Handle<GlobalObject*> global)
 {
     // Create Atomics Object.
     RootedObject objProto(cx, GlobalObject::getOrCreateObjectPrototype(cx, global));
     if (!objProto) {
--- a/js/src/builtin/DataViewObject.cpp
+++ b/js/src/builtin/DataViewObject.cpp
@@ -976,16 +976,17 @@ const Class DataViewObject::class_ = {
 const Class DataViewObject::protoClass_ = {
     js_Object_str,
     JSCLASS_HAS_CACHED_PROTO(JSProto_DataView),
     JS_NULL_CLASS_OPS,
     &DataViewObject::classSpec_
 };
 
 const JSFunctionSpec DataViewObject::methods[] = {
+    // clang-format off
     JS_FN("getInt8",    DataViewObject::fun_getInt8,      1,0),
     JS_FN("getUint8",   DataViewObject::fun_getUint8,     1,0),
     JS_FN("getInt16",   DataViewObject::fun_getInt16,     1,0),
     JS_FN("getUint16",  DataViewObject::fun_getUint16,    1,0),
     JS_FN("getInt32",   DataViewObject::fun_getInt32,     1,0),
     JS_FN("getUint32",  DataViewObject::fun_getUint32,    1,0),
     JS_FN("getFloat32", DataViewObject::fun_getFloat32,   1,0),
     JS_FN("getFloat64", DataViewObject::fun_getFloat64,   1,0),
@@ -993,16 +994,17 @@ const JSFunctionSpec DataViewObject::met
     JS_FN("setUint8",   DataViewObject::fun_setUint8,     2,0),
     JS_FN("setInt16",   DataViewObject::fun_setInt16,     2,0),
     JS_FN("setUint16",  DataViewObject::fun_setUint16,    2,0),
     JS_FN("setInt32",   DataViewObject::fun_setInt32,     2,0),
     JS_FN("setUint32",  DataViewObject::fun_setUint32,    2,0),
     JS_FN("setFloat32", DataViewObject::fun_setFloat32,   2,0),
     JS_FN("setFloat64", DataViewObject::fun_setFloat64,   2,0),
     JS_FS_END
+    // clang-format on
 };
 
 const JSPropertySpec DataViewObject::properties[] = {
     JS_PSG("buffer", DataViewObject::bufferGetter, 0),
     JS_PSG("byteLength", DataViewObject::byteLengthGetter, 0),
     JS_PSG("byteOffset", DataViewObject::byteOffsetGetter, 0),
     JS_STRING_SYM_PS(toStringTag, "DataView", JSPROP_READONLY),
     JS_PS_END
--- a/js/src/builtin/JSON.cpp
+++ b/js/src/builtin/JSON.cpp
@@ -52,26 +52,28 @@ const Class js::JSONClass = {
 template <typename SrcCharT, typename DstCharT>
 static MOZ_ALWAYS_INLINE RangedPtr<DstCharT>
 InfallibleQuote(RangedPtr<const SrcCharT> srcBegin, RangedPtr<const SrcCharT> srcEnd, RangedPtr<DstCharT> dstPtr)
 {
     // Maps characters < 256 to the value that must follow the '\\' in the quoted string.
     // Entries with 'u' are handled as \\u00xy, and entries with 0 are not escaped in any way.
     // Characters >= 256 are all assumed to be unescaped.
     static const Latin1Char escapeLookup[256] = {
+        // clang-format off
         'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'b', 't',
         'n', 'u', 'f', 'r', 'u', 'u', 'u', 'u', 'u', 'u',
         'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u', 'u',
         'u', 'u', 0,   0,  '\"', 0,   0,   0,   0,   0,
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
         0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
         0,   0,  '\\', // rest are all zeros
+        // clang-format on
     };
 
     /* Step 1. */
     *dstPtr++ = '"';
 
     auto ToLowerHex = [](uint8_t u) {
         MOZ_ASSERT(u <= 0xF);
         return "0123456789abcdef"[u];
@@ -1098,20 +1100,22 @@ json_stringify(JSContext* cx, unsigned a
     } else {
         args.rval().setUndefined();
     }
 
     return true;
 }
 
 static const JSFunctionSpec json_static_methods[] = {
+    // clang-format off
     JS_FN(js_toSource_str,  json_toSource,      0, 0),
     JS_FN("parse",          json_parse,         2, 0),
     JS_FN("stringify",      json_stringify,     3, 0),
     JS_FS_END
+    // clang-format on
 };
 
 JSObject*
 js::InitJSONClass(JSContext* cx, Handle<GlobalObject*> global)
 {
     RootedObject proto(cx, GlobalObject::getOrCreateObjectPrototype(cx, global));
     if (!proto) {
         return nullptr;
--- a/js/src/builtin/MapObject.cpp
+++ b/js/src/builtin/MapObject.cpp
@@ -455,29 +455,31 @@ const Class MapObject::protoClass_ = {
 
 const JSPropertySpec MapObject::properties[] = {
     JS_PSG("size", size, 0),
     JS_STRING_SYM_PS(toStringTag, "Map", JSPROP_READONLY),
     JS_PS_END
 };
 
 const JSFunctionSpec MapObject::methods[] = {
+    // clang-format off
     JS_FN("get", get, 1, 0),
     JS_FN("has", has, 1, 0),
     JS_FN("set", set, 2, 0),
     JS_FN("delete", delete_, 1, 0),
     JS_FN("keys", keys, 0, 0),
     JS_FN("values", values, 0, 0),
     JS_FN("clear", clear, 0, 0),
     JS_SELF_HOSTED_FN("forEach", "MapForEach", 2, 0),
     // MapEntries only exists to preseve the equal identity of
     // entries and @@iterator.
     JS_SELF_HOSTED_FN("entries", "MapEntries", 0, 0),
     JS_SELF_HOSTED_SYM_FN(iterator, "MapEntries", 0, 0),
     JS_FS_END
+    // clang-format on
 };
 
 const JSPropertySpec MapObject::staticProperties[] = {
     JS_SELF_HOSTED_SYM_GET(species, "MapSpecies", 0),
     JS_PS_END
 };
 
 template <class Range>
@@ -1311,28 +1313,30 @@ const Class SetObject::protoClass_ = {
 
 const JSPropertySpec SetObject::properties[] = {
     JS_PSG("size", size, 0),
     JS_STRING_SYM_PS(toStringTag, "Set", JSPROP_READONLY),
     JS_PS_END
 };
 
 const JSFunctionSpec SetObject::methods[] = {
+    // clang-format off
     JS_FN("has", has, 1, 0),
     JS_FN("add", add, 1, 0),
     JS_FN("delete", delete_, 1, 0),
     JS_FN("entries", entries, 0, 0),
     JS_FN("clear", clear, 0, 0),
     JS_SELF_HOSTED_FN("forEach", "SetForEach", 2, 0),
     // SetValues only exists to preseve the equal identity of
     // values, keys and @@iterator.
     JS_SELF_HOSTED_FN("values", "SetValues", 0, 0),
     JS_SELF_HOSTED_FN("keys", "SetValues", 0, 0),
     JS_SELF_HOSTED_SYM_FN(iterator, "SetValues", 0, 0),
     JS_FS_END
+    // clang-format on
 };
 
 const JSPropertySpec SetObject::staticProperties[] = {
     JS_SELF_HOSTED_SYM_GET(species, "SetSpecies", 0),
     JS_PS_END
 };
 
 bool
--- a/js/src/builtin/Object.cpp
+++ b/js/src/builtin/Object.cpp
@@ -2113,36 +2113,41 @@ ProtoSetter(JSContext* cx, unsigned argc
         return false;
     }
 
     args.rval().setUndefined();
     return true;
 }
 
 static const JSFunctionSpec object_methods[] = {
+    // clang-format off
     JS_FN(js_toSource_str,             obj_toSource,                0,0),
     JS_INLINABLE_FN(js_toString_str,   obj_toString,                0,0, ObjectToString),
     JS_SELF_HOSTED_FN(js_toLocaleString_str, "Object_toLocaleString", 0, 0),
     JS_SELF_HOSTED_FN(js_valueOf_str,  "Object_valueOf",            0,0),
     JS_SELF_HOSTED_FN(js_hasOwnProperty_str, "Object_hasOwnProperty", 1,0),
     JS_FN(js_isPrototypeOf_str,        obj_isPrototypeOf,           1,0),
     JS_FN(js_propertyIsEnumerable_str, obj_propertyIsEnumerable,    1,0),
     JS_SELF_HOSTED_FN(js_defineGetter_str, "ObjectDefineGetter",    2,0),
     JS_SELF_HOSTED_FN(js_defineSetter_str, "ObjectDefineSetter",    2,0),
     JS_SELF_HOSTED_FN(js_lookupGetter_str, "ObjectLookupGetter",    1,0),
     JS_SELF_HOSTED_FN(js_lookupSetter_str, "ObjectLookupSetter",    1,0),
     JS_FS_END
+    // clang-format on
 };
 
 static const JSPropertySpec object_properties[] = {
+    // clang-format off
     JS_PSGS("__proto__", ProtoGetter, ProtoSetter, 0),
     JS_PS_END
+    // clang-format on
 };
 
 static const JSFunctionSpec object_static_methods[] = {
+    // clang-format off
     JS_FN("assign",                    obj_assign,                  2, 0),
     JS_SELF_HOSTED_FN("getPrototypeOf", "ObjectGetPrototypeOf",     1, 0),
     JS_FN("setPrototypeOf",            obj_setPrototypeOf,          2, 0),
     JS_SELF_HOSTED_FN("getOwnPropertyDescriptor", "ObjectGetOwnPropertyDescriptor", 2, 0),
     JS_SELF_HOSTED_FN("getOwnPropertyDescriptors", "ObjectGetOwnPropertyDescriptors", 1, 0),
     JS_FN("keys",                      obj_keys,                    1, 0),
     JS_FN("values",                    obj_values,                  1, 0),
     JS_FN("entries",                   obj_entries,                 1, 0),
@@ -2155,16 +2160,17 @@ static const JSFunctionSpec object_stati
     JS_SELF_HOSTED_FN("isExtensible",  "ObjectIsExtensible",        1, 0),
     JS_FN("preventExtensions",         obj_preventExtensions,       1, 0),
     JS_FN("freeze",                    obj_freeze,                  1, 0),
     JS_FN("isFrozen",                  obj_isFrozen,                1, 0),
     JS_FN("seal",                      obj_seal,                    1, 0),
     JS_FN("isSealed",                  obj_isSealed,                1, 0),
     JS_SELF_HOSTED_FN("fromEntries",   "ObjectFromEntries",         1, 0),
     JS_FS_END
+    // clang-format on
 };
 
 static JSObject*
 CreateObjectConstructor(JSContext* cx, JSProtoKey key)
 {
     Rooted<GlobalObject*> self(cx, cx->global());
     if (!GlobalObject::ensureConstructor(cx, self, JSProto_Function)) {
         return nullptr;
--- a/js/src/builtin/String.cpp
+++ b/js/src/builtin/String.cpp
@@ -371,25 +371,27 @@ str_uneval(JSContext* cx, unsigned argc,
         return false;
     }
 
     args.rval().setString(str);
     return true;
 }
 
 static const JSFunctionSpec string_functions[] = {
+    // clang-format off
     JS_FN(js_escape_str,             str_escape,                1, JSPROP_RESOLVING),
     JS_FN(js_unescape_str,           str_unescape,              1, JSPROP_RESOLVING),
     JS_FN(js_uneval_str,             str_uneval,                1, JSPROP_RESOLVING),
     JS_FN(js_decodeURI_str,          str_decodeURI,             1, JSPROP_RESOLVING),
     JS_FN(js_encodeURI_str,          str_encodeURI,             1, JSPROP_RESOLVING),
     JS_FN(js_decodeURIComponent_str, str_decodeURI_Component,   1, JSPROP_RESOLVING),
     JS_FN(js_encodeURIComponent_str, str_encodeURI_Component,   1, JSPROP_RESOLVING),
 
     JS_FS_END
+    // clang-format on
 };
 
 static const unsigned STRING_ELEMENT_ATTRS = JSPROP_ENUMERATE | JSPROP_READONLY | JSPROP_PERMANENT;
 
 static bool
 str_enumerate(JSContext* cx, HandleObject obj)
 {
     RootedString str(cx, obj->as<StringObject>().unbox());
@@ -3370,16 +3372,17 @@ js::str_concat(JSContext* cx, unsigned a
         }
     }
 
     args.rval().setString(str);
     return true;
 }
 
 static const JSFunctionSpec string_methods[] = {
+    // clang-format off
     JS_FN(js_toSource_str,     str_toSource,          0,0),
 
     /* Java-like methods. */
     JS_FN(js_toString_str,     str_toString,          0,0),
     JS_FN(js_valueOf_str,      str_toString,          0,0),
     JS_INLINABLE_FN("toLowerCase", str_toLowerCase,   0,0, StringToLowerCase),
     JS_INLINABLE_FN("toUpperCase", str_toUpperCase,   0,0, StringToUpperCase),
     JS_INLINABLE_FN("charAt",  str_charAt,            1,0, StringCharAt),
@@ -3433,16 +3436,17 @@ static const JSFunctionSpec string_metho
     JS_SELF_HOSTED_FN("sub",      "String_sub",        0,0),
     JS_SELF_HOSTED_FN("anchor",   "String_anchor",     1,0),
     JS_SELF_HOSTED_FN("link",     "String_link",       1,0),
     JS_SELF_HOSTED_FN("fontcolor","String_fontcolor",  1,0),
     JS_SELF_HOSTED_FN("fontsize", "String_fontsize",   1,0),
 
     JS_SELF_HOSTED_SYM_FN(iterator, "String_iterator", 0,0),
     JS_FS_END
+    // clang-format on
 };
 
 // ES6 rev 27 (2014 Aug 24) 21.1.1
 bool
 js::StringConstructor(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
 
@@ -3691,16 +3695,17 @@ js::str_fromCodePoint(JSContext* cx, uns
         return false;
     }
 
     args.rval().setString(str);
     return true;
 }
 
 static const JSFunctionSpec string_static_methods[] = {
+    // clang-format off
     JS_INLINABLE_FN("fromCharCode", js::str_fromCharCode, 1, 0, StringFromCharCode),
     JS_INLINABLE_FN("fromCodePoint", js::str_fromCodePoint, 1, 0, StringFromCodePoint),
 
     JS_SELF_HOSTED_FN("raw",             "String_static_raw",           1,0),
     JS_SELF_HOSTED_FN("substring",       "String_static_substring",     3,0),
     JS_SELF_HOSTED_FN("substr",          "String_static_substr",        3,0),
     JS_SELF_HOSTED_FN("slice",           "String_static_slice",         3,0),
 
@@ -3725,16 +3730,17 @@ static const JSFunctionSpec string_stati
     JS_SELF_HOSTED_FN("toLocaleUpperCase","String_static_toLocaleUpperCase",1,0),
 #if EXPOSE_INTL_API
     JS_SELF_HOSTED_FN("normalize",       "String_static_normalize",     1,0),
 #endif
     JS_SELF_HOSTED_FN("concat",          "String_static_concat",        2,0),
 
     JS_SELF_HOSTED_FN("localeCompare",   "String_static_localeCompare", 2,0),
     JS_FS_END
+    // clang-format on
 };
 
 /* static */ Shape*
 StringObject::assignInitialShape(JSContext* cx, Handle<StringObject*> obj)
 {
     MOZ_ASSERT(obj->empty());
 
     return NativeObject::addDataProperty(cx, obj, cx->names().length, LENGTH_SLOT,
@@ -3817,30 +3823,32 @@ js::InitStringClass(JSContext* cx, Handl
  * - 47: /
  * - 58: :
  * - 59: ;
  * - 61: =
  * - 63: ?
  * - 64: @
  */
 static const bool js_isUriReservedPlusPound[] = {
+// clang-format off
 /*       0     1     2     3     4     5     6     7     8     9  */
 /*  0 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  1 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  2 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  3 */ ____, ____, ____, ____, ____, true, true, ____, true, ____,
 /*  4 */ ____, ____, ____, true, true, ____, ____, true, ____, ____,
 /*  5 */ ____, ____, ____, ____, ____, ____, ____, ____, true, true,
 /*  6 */ ____, true, ____, true, true, ____, ____, ____, ____, ____,
 /*  7 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  8 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  9 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /* 10 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /* 11 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /* 12 */ ____, ____, ____, ____, ____, ____, ____, ____
+// clang-format on
 };
 
 /*
  * Uri unescaped chars:
  * -      33: !
  * -      39: '
  * -      40: (
  * -      41: )
@@ -3849,30 +3857,32 @@ static const bool js_isUriReservedPlusPo
  * -      46: .
  * -  48..57: 0-9
  * -  65..90: A-Z
  * -      95: _
  * - 97..122: a-z
  * -     126: ~
  */
 static const bool js_isUriUnescaped[] = {
+// clang-format off
 /*       0     1     2     3     4     5     6     7     8     9  */
 /*  0 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  1 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  2 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  3 */ ____, ____, ____, true, ____, ____, ____, ____, ____, true,
 /*  4 */ true, true, true, ____, ____, true, true, ____, true, true,
 /*  5 */ true, true, true, true, true, true, true, true, ____, ____,
 /*  6 */ ____, ____, ____, ____, ____, true, true, true, true, true,
 /*  7 */ true, true, true, true, true, true, true, true, true, true,
 /*  8 */ true, true, true, true, true, true, true, true, true, true,
 /*  9 */ true, ____, ____, ____, ____, true, ____, true, true, true,
 /* 10 */ true, true, true, true, true, true, true, true, true, true,
 /* 11 */ true, true, true, true, true, true, true, true, true, true,
 /* 12 */ true, true, true, ____, ____, ____, true, ____
+// clang-format on
 };
 
 #undef ____
 
 static inline bool
 TransferBufferToString(StringBuffer& sb, JSString* str, MutableHandleValue rval)
 {
     if (!sb.empty()) {
--- a/js/src/frontend/TokenStream.cpp
+++ b/js/src/frontend/TokenStream.cpp
@@ -2060,30 +2060,32 @@ enum FirstCharKind {
 #define T_SEMI      size_t(TokenKind::Semi)
 #define T_HOOK      size_t(TokenKind::Hook)
 #define T_LB        size_t(TokenKind::LeftBracket)
 #define T_RB        size_t(TokenKind::RightBracket)
 #define T_LC        size_t(TokenKind::LeftCurly)
 #define T_RC        size_t(TokenKind::RightCurly)
 #define _______     Other
 static const uint8_t firstCharKinds[] = {
+// clang-format off
 /*         0        1        2        3        4        5        6        7        8        9    */
 /*   0+ */ _______, _______, _______, _______, _______, _______, _______, _______, _______,   Space,
 /*  10+ */     EOL,   Space,   Space,     EOL, _______, _______, _______, _______, _______, _______,
 /*  20+ */ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 /*  30+ */ _______, _______,   Space, _______,  String, _______,   Ident, _______, _______,  String,
 /*  40+ */    T_LP,    T_RP, _______, _______, T_COMMA, _______, _______, _______,ZeroDigit,    Dec,
 /*  50+ */     Dec,     Dec,     Dec,     Dec,     Dec,     Dec,     Dec,     Dec, T_COLON,  T_SEMI,
 /*  60+ */ _______, _______, _______,  T_HOOK, _______,   Ident,   Ident,   Ident,   Ident,   Ident,
 /*  70+ */   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,
 /*  80+ */   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,
 /*  90+ */   Ident,    T_LB, _______,    T_RB, _______,   Ident,  String,   Ident,   Ident,   Ident,
 /* 100+ */   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,
 /* 110+ */   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,   Ident,
 /* 120+ */   Ident,   Ident,   Ident,    T_LC, _______,    T_RC,T_BITNOT, _______
+// clang-format on
 };
 #undef T_COMMA
 #undef T_COLON
 #undef T_BITNOT
 #undef T_LP
 #undef T_RP
 #undef T_SEMI
 #undef T_HOOK
--- a/js/src/gc/GC.cpp
+++ b/js/src/gc/GC.cpp
@@ -374,21 +374,23 @@ static const float MinHighFrequencyHeapG
     1.0f / Min(HighFrequencyEagerAllocTriggerFactor, MinAllocationThresholdFactor);
 static const float MinLowFrequencyHeapGrowthFactor =
     1.0f / Min(LowFrequencyEagerAllocTriggerFactor, MinAllocationThresholdFactor);
 
 /* Increase the IGC marking slice time if we are in highFrequencyGC mode. */
 static const int IGC_MARK_SLICE_MULTIPLIER = 2;
 
 const AllocKind gc::slotsToThingKind[] = {
+    // clang-format off
     /*  0 */ AllocKind::OBJECT0,  AllocKind::OBJECT2,  AllocKind::OBJECT2,  AllocKind::OBJECT4,
     /*  4 */ AllocKind::OBJECT4,  AllocKind::OBJECT8,  AllocKind::OBJECT8,  AllocKind::OBJECT8,
     /*  8 */ AllocKind::OBJECT8,  AllocKind::OBJECT12, AllocKind::OBJECT12, AllocKind::OBJECT12,
     /* 12 */ AllocKind::OBJECT12, AllocKind::OBJECT16, AllocKind::OBJECT16, AllocKind::OBJECT16,
     /* 16 */ AllocKind::OBJECT16
+    // clang-format on
 };
 
 // Check that reserved bits of a Cell are compatible with our typical allocators
 // since most derived classes will store a pointer in the first word.
 static_assert(js::detail::LIFO_ALLOC_ALIGN > JS_BITMASK(Cell::ReservedBits),
               "Cell::ReservedBits should support LifoAlloc");
 static_assert(CellAlignBytes > JS_BITMASK(Cell::ReservedBits),
               "Cell::ReservedBits should support gc::Cell");
--- a/js/src/irregexp/NativeRegExpMacroAssembler.cpp
+++ b/js/src/irregexp/NativeRegExpMacroAssembler.cpp
@@ -1416,16 +1416,17 @@ NativeRegExpMacroAssembler::CanReadUnali
 #else
     return true;
 #endif
 }
 
 const uint8_t
 NativeRegExpMacroAssembler::word_character_map[] =
 {
+    // clang-format off
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
 
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0xffu, 0xffu, 0xffu, 0xffu, 0xffu, 0xffu, 0xffu, 0xffu,  // '0' - '7'
@@ -1456,9 +1457,10 @@ NativeRegExpMacroAssembler::word_charact
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
 
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
     0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u,
+    // clang-format on
 };
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -706,37 +706,41 @@ MakeTime(double hour, double min, double
 
 /**
  * end of ECMA 'support' functions
  */
 
 /* for use by date_parse */
 
 static const char* const wtb[] = {
+    // clang-format off
     "am", "pm",
     "monday", "tuesday", "wednesday", "thursday", "friday",
     "saturday", "sunday",
     "january", "february", "march", "april", "may", "june",
     "july", "august", "september", "october", "november", "december",
     "gmt", "ut", "utc",
     "est", "edt",
     "cst", "cdt",
     "mst", "mdt",
     "pst", "pdt"
     /* time zone table needs to be expanded */
+    // clang-format on
 };
 
 static const int ttb[] = {
+    // clang-format off
     -1, -2, 0, 0, 0, 0, 0, 0, 0,       /* AM/PM */
     2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
     10000 + 0, 10000 + 0, 10000 + 0,   /* GMT/UT/UTC */
     10000 + 5 * 60, 10000 + 4 * 60,    /* EST/EDT */
     10000 + 6 * 60, 10000 + 5 * 60,    /* CST/CDT */
     10000 + 7 * 60, 10000 + 6 * 60,    /* MST/MDT */
     10000 + 8 * 60, 10000 + 7 * 60     /* PST/PDT */
+    // clang-format on
 };
 
 template <typename CharT>
 static bool
 RegionMatches(const char* s1, int s1off, const CharT* s2, int s2off, int count)
 {
     while (count > 0 && s1[s1off] && s2[s2off]) {
         if (unicode::ToLowerCase(s1[s1off]) != unicode::ToLowerCase(s2[s2off])) {
@@ -3341,23 +3345,26 @@ date_toPrimitive(JSContext* cx, unsigned
     }
 
     args.rval().set(args.thisv());
     RootedObject obj(cx, &args.thisv().toObject());
     return OrdinaryToPrimitive(cx, obj, hint, args.rval());
 }
 
 static const JSFunctionSpec date_static_methods[] = {
+    // clang-format off
     JS_FN("UTC",                 date_UTC,                7,0),
     JS_FN("parse",               date_parse,              1,0),
     JS_FN("now",                 date_now,                0,0),
     JS_FS_END
+    // clang-format on
 };
 
 static const JSFunctionSpec date_methods[] = {
+    // clang-format off
     JS_FN("getTime",             date_getTime,            0,0),
     JS_FN("getTimezoneOffset",   date_getTimezoneOffset,  0,0),
     JS_FN("getYear",             date_getYear,            0,0),
     JS_FN("getFullYear",         date_getFullYear,        0,0),
     JS_FN("getUTCFullYear",      date_getUTCFullYear,     0,0),
     JS_FN("getMonth",            date_getMonth,           0,0),
     JS_FN("getUTCMonth",         date_getUTCMonth,        0,0),
     JS_FN("getDate",             date_getDate,            0,0),
@@ -3402,16 +3409,17 @@ static const JSFunctionSpec date_methods
     JS_FN("toTimeString",        date_toTimeString,       0,0),
     JS_FN("toISOString",         date_toISOString,        0,0),
     JS_FN(js_toJSON_str,         date_toJSON,             1,0),
     JS_FN(js_toSource_str,       date_toSource,           0,0),
     JS_FN(js_toString_str,       date_toString,           0,0),
     JS_FN(js_valueOf_str,        date_valueOf,            0,0),
     JS_SYM_FN(toPrimitive,       date_toPrimitive,        1,JSPROP_READONLY),
     JS_FS_END
+    // clang-format on
 };
 
 static bool
 NewDateObject(JSContext* cx, const CallArgs& args, ClippedTime t)
 {
     MOZ_ASSERT(args.isConstructing());
 
     RootedObject proto(cx);
--- a/js/src/jsmath.cpp
+++ b/js/src/jsmath.cpp
@@ -114,25 +114,27 @@ using mozilla::IsNegative;
 using mozilla::IsNegativeZero;
 using mozilla::PositiveInfinity;
 using mozilla::NegativeInfinity;
 using mozilla::WrappingMultiply;
 using JS::ToNumber;
 using JS::GenericNaN;
 
 static const JSConstDoubleSpec math_constants[] = {
+    // clang-format off
     {"E"      ,  M_E       },
     {"LOG2E"  ,  M_LOG2E   },
     {"LOG10E" ,  M_LOG10E  },
     {"LN2"    ,  M_LN2     },
     {"LN10"   ,  M_LN10    },
     {"PI"     ,  M_PI      },
     {"SQRT2"  ,  M_SQRT2   },
     {"SQRT1_2",  M_SQRT1_2 },
     {nullptr  ,  0         }
+    // clang-format on
 };
 
 typedef double (*UnaryMathFunctionType)(double);
 
 template <UnaryMathFunctionType F>
 static bool
 math_function(JSContext* cx, HandleValue val, MutableHandleValue res)
 {
@@ -1173,16 +1175,17 @@ static bool
 math_toSource(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     args.rval().setString(cx->names().Math);
     return true;
 }
 
 static const JSFunctionSpec math_static_methods[] = {
+    // clang-format off
     JS_FN(js_toSource_str,  math_toSource,        0, 0),
     JS_INLINABLE_FN("abs",    math_abs,             1, 0, MathAbs),
     JS_INLINABLE_FN("acos",   math_acos,            1, 0, MathACos),
     JS_INLINABLE_FN("asin",   math_asin,            1, 0, MathASin),
     JS_INLINABLE_FN("atan",   math_atan,            1, 0, MathATan),
     JS_INLINABLE_FN("atan2",  math_atan2,           2, 0, MathATan2),
     JS_INLINABLE_FN("ceil",   math_ceil,            1, 0, MathCeil),
     JS_INLINABLE_FN("clz32",  math_clz32,           1, 0, MathClz32),
@@ -1210,16 +1213,17 @@ static const JSFunctionSpec math_static_
     JS_INLINABLE_FN("acosh",  math_acosh,           1, 0, MathACosH),
     JS_INLINABLE_FN("asinh",  math_asinh,           1, 0, MathASinH),
     JS_INLINABLE_FN("atanh",  math_atanh,           1, 0, MathATanH),
     JS_INLINABLE_FN("hypot",  math_hypot,           2, 0, MathHypot),
     JS_INLINABLE_FN("trunc",  math_trunc,           1, 0, MathTrunc),
     JS_INLINABLE_FN("sign",   math_sign,            1, 0, MathSign),
     JS_INLINABLE_FN("cbrt",   math_cbrt,            1, 0, MathCbrt),
     JS_FS_END
+    // clang-format on
 };
 
 JSObject*
 js::InitMathClass(JSContext* cx, Handle<GlobalObject*> global)
 {
     RootedObject proto(cx, GlobalObject::getOrCreateObjectPrototype(cx, global));
     if (!proto) {
         return nullptr;
--- a/js/src/jsnum.cpp
+++ b/js/src/jsnum.cpp
@@ -1200,28 +1200,30 @@ num_toPrecision_impl(JSContext* cx, cons
 static bool
 num_toPrecision(JSContext* cx, unsigned argc, Value* vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
     return CallNonGenericMethod<IsNumber, num_toPrecision_impl>(cx, args);
 }
 
 static const JSFunctionSpec number_methods[] = {
+    // clang-format off
     JS_FN(js_toSource_str,       num_toSource,          0, 0),
     JS_FN(js_toString_str,       num_toString,          1, 0),
 #if EXPOSE_INTL_API
     JS_SELF_HOSTED_FN(js_toLocaleString_str, "Number_toLocaleString", 0,0),
 #else
     JS_FN(js_toLocaleString_str, num_toLocaleString,     0,0),
 #endif
     JS_FN(js_valueOf_str,        num_valueOf,           0, 0),
     JS_FN("toFixed",             num_toFixed,           1, 0),
     JS_FN("toExponential",       num_toExponential,     1, 0),
     JS_FN("toPrecision",         num_toPrecision,       1, 0),
     JS_FS_END
+    // clang-format on
 };
 
 bool
 js::IsInteger(const Value& val)
 {
     return val.isInt32() ||
            (mozilla::IsFinite(val.toDouble()) && JS::ToInteger(val.toDouble()) == val.toDouble());
 }
@@ -1328,28 +1330,30 @@ js::InitNumberClass(JSContext* cx, Handl
         return nullptr;
     }
 
     /*
      * Our NaN must be one particular canonical value, because we rely on NaN
      * encoding for our value representation.  See Value.h.
      */
     static const JSConstDoubleSpec number_constants[] = {
+        // clang-format off
         {"NaN",               GenericNaN()               },
         {"POSITIVE_INFINITY", mozilla::PositiveInfinity<double>() },
         {"NEGATIVE_INFINITY", mozilla::NegativeInfinity<double>() },
         {"MAX_VALUE",         1.7976931348623157E+308    },
         {"MIN_VALUE",         MinNumberValue<double>()   },
         /* ES6 (April 2014 draft) 20.1.2.6 */
         {"MAX_SAFE_INTEGER",  9007199254740991           },
         /* ES6 (April 2014 draft) 20.1.2.10 */
         {"MIN_SAFE_INTEGER", -9007199254740991,          },
         /* ES6 (May 2013 draft) 15.7.3.7 */
         {"EPSILON", 2.2204460492503130808472633361816e-16},
         {0,0}
+        // clang-format on
     };
 
     /* Add numeric constants (MAX_VALUE, NaN, &c.) to the Number constructor. */
     if (!JS_DefineConstDoubles(cx, ctor, number_constants)) {
         return nullptr;
     }
 
     if (!DefinePropertiesAndFunctions(cx, ctor, nullptr, number_static_methods)) {
--- a/js/src/perf/jsperf.cpp
+++ b/js/src/perf/jsperf.cpp
@@ -95,21 +95,23 @@ pm_canMeasureSomething(JSContext* cx, un
         return false;
 
     args.rval().setBoolean(PerfMeasurement::canMeasureSomething());
     return true;
 }
 
 static const uint8_t PM_FATTRS = JSPROP_READONLY | JSPROP_PERMANENT;
 static const JSFunctionSpec pm_fns[] = {
+    // clang-format off
     JS_FN("start",               pm_start,               0, PM_FATTRS),
     JS_FN("stop",                pm_stop,                0, PM_FATTRS),
     JS_FN("reset",               pm_reset,               0, PM_FATTRS),
     JS_FN("canMeasureSomething", pm_canMeasureSomething, 0, PM_FATTRS),
     JS_FS_END
+    // clang-format on
 };
 
 static const uint8_t PM_PATTRS =
     JSPROP_ENUMERATE | JSPROP_PERMANENT;
 
 #define GETTER(name)                            \
     JS_PSG(#name, pm_get_##name, PM_PATTRS)
 
--- a/js/src/util/Unicode.cpp
+++ b/js/src/util/Unicode.cpp
@@ -50,16 +50,17 @@ using namespace js::unicode;
  *    put index as chunk in cache
  *
  *   push index >> shift to index1
  *
  *  increase shift
  *  stop if you found the best shift
  */
 const CharacterInfo unicode::js_charinfo[] = {
+    // clang-format off
     { 0, 0, 0 },
     { 0, 0, 1 },
     { 0, 0, 4 },
     { 0, 32, 2 },
     { 65504, 0, 2 },
     { 0, 0, 2 },
     { 743, 0, 2 },
     { 121, 0, 2 },
@@ -220,19 +221,21 @@ const CharacterInfo unicode::js_charinfo
     { 0, 23221, 2 },
     { 0, 23231, 2 },
     { 0, 23278, 2 },
     { 0, 23254, 2 },
     { 0, 23275, 2 },
     { 0, 928, 2 },
     { 64608, 0, 2 },
     { 26672, 0, 2 },
+    // clang-format on
 };
 
 const uint8_t unicode::index1[] = {
+    // clang-format off
       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,  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,  26,  26,  26,  26,
      26,  68,  69,  70,  71,  72,  73,  74,  75,  26,  26,  26,  26,  26,  26,  26,  26,  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,  26, 103,  26, 104, 105, 105, 106, 105, 107, 108,
     109, 110, 111, 112, 113, 114, 115, 116, 117,  94,  94,  94,  94,  94,  94,  94,  94,  94,
@@ -280,19 +283,21 @@ const uint8_t unicode::index1[] = {
      94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,  94,
      94,  94,  94,  94,  94,  94,  26,  26,  26,  26,  26, 162,  26, 163, 164, 165, 166, 167,
      26,  26,  26,  26, 168, 169, 170, 171, 172, 173,  26, 174, 175, 176, 177, 178,
+     // clang-format on
 };
 
 const uint8_t unicode::index2[] = {
+      // clang-format off
       0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   1,   1,   1,   1,   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,   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,   0,   0,   0,   0,   2,   0,   4,   4,   4,   4,   4,   4,   4,   4,   4,   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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -920,19 +925,21 @@ const uint8_t unicode::index2[] = {
       5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,
       5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,
       5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,
       5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   5,   0,   0,   0,
       5,   5,   5,   5,   5,   5,   0,   0,   5,   5,   5,   5,   5,   5,   0,   0,   5,   5,
       5,   5,   5,   5,   0,   0,   5,   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,
+      // clang-format on
 };
 
 const CodepointsWithSameUpperCaseInfo unicode::js_codepoints_with_same_upper_info[] = {
+    // clang-format off
     { 0, 0, 0 },
     { 32, 0, 0 },
     { 32, 232, 0 },
     { 32, 300, 0 },
     { 0, 200, 0 },
     { 0, 268, 0 },
     { 0, 775, 0 },
     { 1, 0, 0 },
@@ -1058,19 +1065,21 @@ const CodepointsWithSameUpperCaseInfo un
     { 23228, 0, 0 },
     { 23217, 0, 0 },
     { 23221, 0, 0 },
     { 23231, 0, 0 },
     { 23278, 0, 0 },
     { 23254, 0, 0 },
     { 23275, 0, 0 },
     { 928, 0, 0 },
+    // clang-format on
 };
 
 const uint8_t unicode::codepoints_with_same_upper_index1[] = {
+     // clang-format off
       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   0,   0,  10,  11,  12,  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,  19,  20,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,  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,  23,   0,   0,   0,   0,   0,  24,  25,  26,  24,  27,  28,
      29,  30,   0,   0,   0,   0,  31,  32,  33,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1118,19 +1127,21 @@ const uint8_t unicode::codepoints_with_s
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  44,   0,   0,   0,
+      // clang-format on
 };
 
 const uint8_t unicode::codepoints_with_same_upper_index2[] = {
+      // clang-format off
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   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,   2,   1,   1,   1,   1,   1,   1,   1,   1,   1,   3,   1,   1,   1,   1,   1,   1,
       1,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1281,19 +1292,21 @@ const uint8_t unicode::codepoints_with_s
       0,   0,   0,   0,   0,   0,   0,   0,   0,   7,   0,   7,   0, 125,   7,   0,   7,   0,
       7,   0,   7,   0,   7,   0,   0,   0,   0,   7,   0, 126,   0,   0,   7,   0,   7,   0,
       0,   0,   7,   0,   7,   0,   7,   0,   7,   0,   7,   0,   7,   0,   7,   0,   7,   0,
       7,   0,   7,   0, 127, 128, 129, 130, 127,   0, 131, 132, 133, 134,   7,   0,   7,   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,   1,   1,   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,
+      // clang-format on
 };
 
 const FoldingInfo unicode::js_foldinfo[] = {
+    // clang-format off
     { 0, 0, 0, 0 },
     { 32, 0, 0, 0 },
     { 32, 8415, 0, 0 },
     { 32, 300, 0, 0 },
     { 0, 65504, 0, 0 },
     { 0, 65504, 8383, 0 },
     { 0, 65504, 268, 0 },
     { 775, 743, 0, 0 },
@@ -1498,19 +1511,21 @@ const FoldingInfo unicode::js_foldinfo[]
     { 23221, 0, 0, 0 },
     { 23231, 0, 0, 0 },
     { 23278, 0, 0, 0 },
     { 23254, 0, 0, 0 },
     { 23275, 0, 0, 0 },
     { 928, 0, 0, 0 },
     { 0, 64608, 0, 0 },
     { 26672, 0, 0, 0 },
+    // clang-format on
 };
 
 const uint8_t unicode::folding_index1[] = {
+     // clang-format off
       0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,   0,   0,  11,  12,  13,  14,  15,
      16,  17,  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,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,  21,  22,   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,  25,   0,   0,  26,   0,   0,  27,  28,  29,  27,  30,  31,
      32,  33,   0,   0,   0,   0,  34,  35,  36,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1558,19 +1573,21 @@ const uint8_t unicode::folding_index1[] 
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   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,  51,   0,   0,
+      // clang-format on
 };
 
 const uint8_t unicode::folding_index2[] = {
+      // clang-format off
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   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,   2,   1,   1,   1,   1,   1,   1,   1,   3,   1,   1,   1,   1,   1,   1,
       1,   0,   0,   0,   0,   0,   0,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   5,
       4,   4,   4,   4,   4,   4,   4,   6,   4,   4,   4,   4,   4,   4,   4,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
@@ -1746,21 +1763,23 @@ const uint8_t unicode::folding_index2[] 
     213, 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, 213, 213,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   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,   0,   0,   0,   0,   0,   0,   4,   4,   4,   4,   4,   4,   4,   4,   4,   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,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+      // clang-format off
 };
 
 bool
 js::unicode::IsIdentifierStartNonBMP(uint32_t codePoint)
 {
+    // clang-format off
     if (codePoint >= 0x10000 && codePoint <= 0x1000B) { // LINEAR B SYLLABLE B008 A .. LINEAR B SYLLABLE B046 JE
         return true;
     }
     if (codePoint >= 0x1000D && codePoint <= 0x10026) { // LINEAR B SYLLABLE B036 JO .. LINEAR B SYLLABLE B032 QO
         return true;
     }
     if (codePoint >= 0x10028 && codePoint <= 0x1003A) { // LINEAR B SYLLABLE B060 RA .. LINEAR B SYLLABLE B042 WO
         return true;
@@ -2403,21 +2422,23 @@ js::unicode::IsIdentifierStartNonBMP(uin
     }
     if (codePoint >= 0x2CEB0 && codePoint <= 0x2EBE0) { // CJK Ideograph Extension F .. CJK Ideograph Extension F
         return true;
     }
     if (codePoint >= 0x2F800 && codePoint <= 0x2FA1D) { // CJK COMPATIBILITY IDEOGRAPH-2F800 .. CJK COMPATIBILITY IDEOGRAPH-2FA1D
         return true;
     }
     return false;
+    // clang-format on
 }
 
 bool
 js::unicode::IsIdentifierPartNonBMP(uint32_t codePoint)
 {
+    // clang-format off
     if (codePoint >= 0x10000 && codePoint <= 0x1000B) { // LINEAR B SYLLABLE B008 A .. LINEAR B SYLLABLE B046 JE
         return true;
     }
     if (codePoint >= 0x1000D && codePoint <= 0x10026) { // LINEAR B SYLLABLE B036 JO .. LINEAR B SYLLABLE B032 QO
         return true;
     }
     if (codePoint >= 0x10028 && codePoint <= 0x1003A) { // LINEAR B SYLLABLE B060 RA .. LINEAR B SYLLABLE B042 WO
         return true;
@@ -3225,16 +3246,17 @@ js::unicode::IsIdentifierPartNonBMP(uint
     }
     if (codePoint >= 0x2F800 && codePoint <= 0x2FA1D) { // CJK COMPATIBILITY IDEOGRAPH-2F800 .. CJK COMPATIBILITY IDEOGRAPH-2FA1D
         return true;
     }
     if (codePoint >= 0xE0100 && codePoint <= 0xE01EF) { // VARIATION SELECTOR-17 .. VARIATION SELECTOR-256
         return true;
     }
     return false;
+    // clang-format on
 }
 
 bool
 js::unicode::ChangesWhenUpperCasedSpecialCasing(char16_t ch)
 {
     if (ch < 0x00DF || ch > 0xFB17) {
         return false;
     }
@@ -3289,16 +3311,17 @@ js::unicode::ChangesWhenUpperCasedSpecia
     // U+FB13 ARMENIAN SMALL LIGATURE MEN NOW .. U+FB17 ARMENIAN SMALL LIGATURE MEN XEH
     return (ch >= 0xFB00 && ch <= 0xFB06) || (ch >= 0xFB13 && ch <= 0xFB17);
 }
 
 size_t
 js::unicode::LengthUpperCaseSpecialCasing(char16_t ch)
 {
     switch(ch) {
+      // clang-format off
       case 0x00DF: return 2; // LATIN SMALL LETTER SHARP S
       case 0x0149: return 2; // LATIN SMALL LETTER N PRECEDED BY APOSTROPHE (LATIN SMALL LETTER APOSTROPHE N)
       case 0x01F0: return 2; // LATIN SMALL LETTER J WITH CARON (LATIN SMALL LETTER J HACEK)
       case 0x0390: return 3; // GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS (GREEK SMALL LETTER IOTA DIAERESIS TONOS)
       case 0x03B0: return 3; // GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS (GREEK SMALL LETTER UPSILON DIAERESIS TONOS)
       case 0x0587: return 2; // ARMENIAN SMALL LIGATURE ECH YIWN
       case 0x1E96: return 2; // LATIN SMALL LETTER H WITH LINE BELOW
       case 0x1E97: return 2; // LATIN SMALL LETTER T WITH DIAERESIS
@@ -3391,16 +3414,17 @@ js::unicode::LengthUpperCaseSpecialCasin
       case 0xFB04: return 3; // LATIN SMALL LIGATURE FFL
       case 0xFB05: return 2; // LATIN SMALL LIGATURE LONG S T
       case 0xFB06: return 2; // LATIN SMALL LIGATURE ST
       case 0xFB13: return 2; // ARMENIAN SMALL LIGATURE MEN NOW
       case 0xFB14: return 2; // ARMENIAN SMALL LIGATURE MEN ECH
       case 0xFB15: return 2; // ARMENIAN SMALL LIGATURE MEN INI
       case 0xFB16: return 2; // ARMENIAN SMALL LIGATURE VEW NOW
       case 0xFB17: return 2; // ARMENIAN SMALL LIGATURE MEN XEH
+      // clang-format on
     }
 
     MOZ_ASSERT_UNREACHABLE("Bad character input.");
     return 0;
 }
 
 void
 js::unicode::AppendUpperCaseSpecialCasing(char16_t ch, char16_t* elements, size_t* index)
@@ -3840,68 +3864,74 @@ js::unicode::AppendUpperCaseSpecialCasin
 /*
  * Identifier start chars:
  * -      36:    $
  * -  65..90: A..Z
  * -      95:    _
  * - 97..122: a..z
  */
 const bool unicode::js_isidstart[] = {
+// clang-format off
 /*       0     1     2     3     4     5     6     7     8     9  */
 /*  0 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  1 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  2 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  3 */ ____, ____, ____, ____, ____, ____, true, ____, ____, ____,
 /*  4 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  5 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  6 */ ____, ____, ____, ____, ____, true, true, true, true, true,
 /*  7 */ true, true, true, true, true, true, true, true, true, true,
 /*  8 */ true, true, true, true, true, true, true, true, true, true,
 /*  9 */ true, ____, ____, ____, ____, true, ____, true, true, true,
 /* 10 */ true, true, true, true, true, true, true, true, true, true,
 /* 11 */ true, true, true, true, true, true, true, true, true, true,
 /* 12 */ true, true, true, ____, ____, ____, ____, ____,
+// clang-format on
 };
 
 /*
  * Identifier chars:
  * -      36:    $
  * -  48..57: 0..9
  * -  65..90: A..Z
  * -      95:    _
  * - 97..122: a..z
  */
 const bool unicode::js_isident[] = {
+// clang-format off
 /*       0     1     2     3     4     5     6     7     8     9  */
 /*  0 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  1 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  2 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  3 */ ____, ____, ____, ____, ____, ____, true, ____, ____, ____,
 /*  4 */ ____, ____, ____, ____, ____, ____, ____, ____, true, true,
 /*  5 */ true, true, true, true, true, true, true, true, ____, ____,
 /*  6 */ ____, ____, ____, ____, ____, true, true, true, true, true,
 /*  7 */ true, true, true, true, true, true, true, true, true, true,
 /*  8 */ true, true, true, true, true, true, true, true, true, true,
 /*  9 */ true, ____, ____, ____, ____, true, ____, true, true, true,
 /* 10 */ true, true, true, true, true, true, true, true, true, true,
 /* 11 */ true, true, true, true, true, true, true, true, true, true,
 /* 12 */ true, true, true, ____, ____, ____, ____, ____,
+// clang-format on
 };
 
 /* Whitespace chars: '\t', '\n', '\v', '\f', '\r', ' '. */
 const bool unicode::js_isspace[] = {
+// clang-format of
 /*       0     1     2     3     4     5     6     7     8     9  */
 /*  0 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, true,
 /*  1 */ true, true, true, true, ____, ____, ____, ____, ____, ____,
 /*  2 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  3 */ ____, ____, true, ____, ____, ____, ____, ____, ____, ____,
 /*  4 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  5 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  6 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  7 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  8 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /*  9 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /* 10 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /* 11 */ ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
 /* 12 */ ____, ____, ____, ____, ____, ____, ____, ____,
+// clang-format on
 };
 
 #undef ____
--- a/js/src/vm/JSFunction.cpp
+++ b/js/src/vm/JSFunction.cpp
@@ -1924,23 +1924,25 @@ JSFunction::maybeRelazify(JSRuntime* rt)
         MOZ_ASSERT(isExtended());
         MOZ_ASSERT(getExtendedSlot(LAZY_FUNCTION_NAME_SLOT).toString()->isAtom());
     }
 
     realm->scheduleDelazificationForDebugger();
 }
 
 const JSFunctionSpec js::function_methods[] = {
+    // clang-format off
     JS_FN(js_toSource_str,   fun_toSource,   0,0),
     JS_FN(js_toString_str,   fun_toString,   0,0),
     JS_FN(js_apply_str,      fun_apply,      2,0),
     JS_FN(js_call_str,       fun_call,       1,0),
     JS_SELF_HOSTED_FN("bind", "FunctionBind", 2, 0),
     JS_SYM_FN(hasInstance, fun_symbolHasInstance, 1, JSPROP_READONLY | JSPROP_PERMANENT),
     JS_FS_END
+    // clang-format on
 };
 
 // ES2018 draft rev 2aea8f3e617b49df06414eb062ab44fad87661d3
 // 19.2.1.1.1 CreateDynamicFunction( constructor, newTarget, kind, args )
 static bool
 CreateDynamicFunction(JSContext* cx, const CallArgs& args, GeneratorKind generatorKind,
                       FunctionAsyncKind asyncKind)
 {
--- a/js/src/vm/Printer.cpp
+++ b/js/src/vm/Printer.cpp
@@ -276,26 +276,28 @@ Sprinter::jsprintf(const char* format, .
 
     bool r = vprintf(format, ap);
     va_end(ap);
 
     return r;
 }
 
 const char js_EscapeMap[] = {
+     // clang-format off
     '\b', 'b',
     '\f', 'f',
     '\n', 'n',
     '\r', 'r',
     '\t', 't',
     '\v', 'v',
     '"',  '"',
     '\'', '\'',
     '\\', '\\',
     '\0'
+    // clang-format on
 };
 
 template <typename CharT>
 static bool
 QuoteString(Sprinter* sp, const mozilla::Range<const CharT> chars, char quote)
 {
     using CharPtr = mozilla::RangedPtr<const CharT>;
 
--- a/js/src/vm/SelfHosting.cpp
+++ b/js/src/vm/SelfHosting.cpp
@@ -2376,16 +2376,17 @@ intrinsic_CopyDataPropertiesOrGetOwnKeys
 // content script might have changed the builtins' prototypes' members.
 // Installing the whole set of builtins in the self-hosting compartment, OTOH,
 // would be wasteful: it increases memory usage and initialization time for
 // self-hosting compartment.
 //
 // Additionally, a set of C++-implemented helper functions is defined on the
 // self-hosting global.
 static const JSFunctionSpec intrinsic_functions[] = {
+    // clang-format off
     JS_INLINABLE_FN("std_Array",                 array_construct,              1,0, Array),
     JS_INLINABLE_FN("std_Array_join",            array_join,                   1,0, ArrayJoin),
     JS_INLINABLE_FN("std_Array_push",            array_push,                   1,0, ArrayPush),
     JS_INLINABLE_FN("std_Array_pop",             array_pop,                    0,0, ArrayPop),
     JS_INLINABLE_FN("std_Array_shift",           array_shift,                  0,0, ArrayShift),
     JS_FN("std_Array_unshift",                   array_unshift,                1,0),
     JS_INLINABLE_FN("std_Array_slice",           array_slice,                  2,0, ArraySlice),
     JS_FN("std_Array_reverse",                   array_reverse,                0,0),
@@ -2769,16 +2770,17 @@ static const JSFunctionSpec intrinsic_fu
     JS_FN("ExecuteModule", intrinsic_ExecuteModule, 1, 0),
     JS_FN("NewModuleNamespace", intrinsic_NewModuleNamespace, 2, 0),
     JS_FN("AddModuleNamespaceBinding", intrinsic_AddModuleNamespaceBinding, 4, 0),
     JS_FN("ModuleNamespaceExports", intrinsic_ModuleNamespaceExports, 1, 0),
 
     JS_FN("PromiseResolve", intrinsic_PromiseResolve, 2, 0),
 
     JS_FS_END
+    // clang-format on
 };
 
 void
 js::FillSelfHostingCompileOptions(CompileOptions& options)
 {
     /*
      * In self-hosting mode, scripts use JSOP_GETINTRINSIC instead of
      * JSOP_GETNAME or JSOP_GETGNAME to access unbound variables.
--- a/js/src/vm/StringType.cpp
+++ b/js/src/vm/StringType.cpp
@@ -1141,29 +1141,33 @@ JSFlatString::isIndexSlow(const char16_t
 #define R4(n) R2(n), R2((n) + (1 << 2)), R2((n) + (2 << 2)), R2((n) + (3 << 2))
 #define R6(n) R4(n), R4((n) + (1 << 4)), R4((n) + (2 << 4)), R4((n) + (3 << 4))
 #define R7(n) R6(n), R6((n) + (1 << 6))
 
 /*
  * This is used when we generate our table of short strings, so the compiler is
  * happier if we use |c| as few times as possible.
  */
+// clang-format off
 #define FROM_SMALL_CHAR(c) Latin1Char((c) + ((c) < 10 ? '0' :      \
                                              (c) < 36 ? 'a' - 10 : \
                                              'A' - 36))
+// clang-format on
 
 /*
  * Declare length-2 strings. We only store strings where both characters are
  * alphanumeric. The lower 10 short chars are the numerals, the next 26 are
  * the lowercase letters, and the next 26 are the uppercase letters.
  */
+// clang-format off
 #define TO_SMALL_CHAR(c) ((c) >= '0' && (c) <= '9' ? (c) - '0' :              \
                           (c) >= 'a' && (c) <= 'z' ? (c) - 'a' + 10 :         \
                           (c) >= 'A' && (c) <= 'Z' ? (c) - 'A' + 36 :         \
                           StaticStrings::INVALID_SMALL_CHAR)
+// clang-format on
 
 #define R TO_SMALL_CHAR
 const StaticStrings::SmallChar StaticStrings::toSmallChar[] = { R7(0) };
 #undef R
 
 #undef R2
 #undef R4
 #undef R6
--- a/js/xpconnect/src/XPCShellImpl.cpp
+++ b/js/xpconnect/src/XPCShellImpl.cpp
@@ -673,16 +673,17 @@ RegisterXPCTestComponents(JSContext* cx,
         XPCThrower::Throw(rv, cx);
         return false;
     }
     return true;
 }
 #endif
 
 static const JSFunctionSpec glob_functions[] = {
+    // clang-format off
     JS_FN("print",           Print,          0,0),
     JS_FN("readline",        ReadLine,       1,0),
     JS_FN("load",            Load,           1,0),
     JS_FN("quit",            Quit,           0,0),
     JS_FN("dumpXPC",         DumpXPC,        1,0),
     JS_FN("dump",            Dump,           1,0),
     JS_FN("gc",              GC,             0,0),
 #ifdef JS_GC_ZEAL
@@ -694,16 +695,17 @@ static const JSFunctionSpec glob_functio
     JS_FN("btoa",            xpc::Btoa,      1,0),
     JS_FN("setInterruptCallback", SetInterruptCallback, 1,0),
     JS_FN("simulateNoScriptActivity", SimulateNoScriptActivity, 1,0),
     JS_FN("registerAppManifest", RegisterAppManifest, 1, 0),
 #ifdef ENABLE_TESTS
     JS_FN("registerXPCTestComponents", RegisterXPCTestComponents, 0, 0),
 #endif
     JS_FS_END
+    // clang-format on
 };
 
 /***************************************************************************/
 
 typedef enum JSShellErrNum {
 #define MSG_DEF(name, number, count, exception, format) \
     name = number,
 #include "jsshell.msg"
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -252,23 +252,25 @@ struct RangePaintInfo {
 static uint32_t gVerifyReflowFlags;
 
 struct VerifyReflowFlags {
   const char*    name;
   uint32_t bit;
 };
 
 static const VerifyReflowFlags gFlags[] = {
+  // clang-format off
   { "verify",                VERIFY_REFLOW_ON },
   { "reflow",                VERIFY_REFLOW_NOISY },
   { "all",                   VERIFY_REFLOW_ALL },
   { "list-commands",         VERIFY_REFLOW_DUMP_COMMANDS },
   { "noisy-commands",        VERIFY_REFLOW_NOISY_RC },
   { "really-noisy-commands", VERIFY_REFLOW_REALLY_NOISY_RC },
   { "resize",                VERIFY_REFLOW_DURING_RESIZE_REFLOW },
+  // clang-format on
 };
 
 #define NUM_VERIFY_REFLOW_FLAGS (sizeof(gFlags) / sizeof(gFlags[0]))
 
 static void
 ShowVerifyReflowFlags()
 {
   printf("Here are the available GECKO_VERIFY_REFLOW_FLAGS:\n");
--- a/layout/build/nsContentDLF.h
+++ b/layout/build/nsContentDLF.h
@@ -62,16 +62,17 @@ public:
 private:
   static nsresult EnsureUAStyleSheet();
   static bool IsImageContentType(const char* aContentType);
 };
 
 nsresult
 NS_NewContentDocumentLoaderFactory(nsIDocumentLoaderFactory** aResult);
 
+// clang-format off
 #ifdef MOZ_WEBM
 #define CONTENTDLF_WEBM_CATEGORIES \
     { "Gecko-Content-Viewers", VIDEO_WEBM, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", AUDIO_WEBM, "@mozilla.org/content/document-loader-factory;1" },
 #else
 #define CONTENTDLF_WEBM_CATEGORIES
 #endif
 
@@ -95,12 +96,12 @@ NS_NewContentDocumentLoaderFactory(nsIDo
     { "Gecko-Content-Viewers", TEXT_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_CACHED_XUL, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", VIEWSOURCE_CONTENT_TYPE, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", IMAGE_SVG_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_MATHML_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", TEXT_VTT, "@mozilla.org/content/document-loader-factory;1" }, \
     { "Gecko-Content-Viewers", APPLICATION_WAPXHTML_XML, "@mozilla.org/content/document-loader-factory;1" }, \
     CONTENTDLF_WEBM_CATEGORIES
-
+// clang-format on
 
 #endif
 
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -500,16 +500,17 @@ NS_DEFINE_NAMED_CID(PRESENTATION_SERVICE
 NS_DEFINE_NAMED_CID(PRESENTATION_DEVICE_MANAGER_CID);
 NS_DEFINE_NAMED_CID(PRESENTATION_TCP_SESSION_TRANSPORT_CID);
 
 NS_DEFINE_NAMED_CID(TEXT_INPUT_PROCESSOR_CID);
 
 NS_DEFINE_NAMED_CID(NS_SCRIPTERROR_CID);
 
 static const mozilla::Module::CIDEntry kLayoutCIDs[] = {
+  // clang-format off
   XPCONNECT_CIDENTRIES
 #ifdef DEBUG
   { &kNS_LAYOUT_DEBUGGER_CID, false, nullptr, CreateNewLayoutDebugger },
 #endif
   { &kNS_FRAMETRAVERSAL_CID, false, nullptr, CreateNewFrameTraversal },
   { &kIN_DEEPTREEWALKER_CID, false, nullptr, inDeepTreeWalkerConstructor },
   { &kNS_CONTENT_VIEWER_CID, false, nullptr, CreateContentViewer },
   { &kNS_TEXT_ENCODER_CID, false, nullptr, CreateTextEncoder },
@@ -577,19 +578,21 @@ static const mozilla::Module::CIDEntry k
   { &kNS_ACCESSIBILITY_SERVICE_CID, false, nullptr, CreateA11yService },
 #endif
   { &kPRESENTATION_SERVICE_CID, false, nullptr, nsIPresentationServiceConstructor },
   { &kPRESENTATION_DEVICE_MANAGER_CID, false, nullptr, PresentationDeviceManagerConstructor },
   { &kPRESENTATION_TCP_SESSION_TRANSPORT_CID, false, nullptr, PresentationTCPSessionTransportConstructor },
   { &kTEXT_INPUT_PROCESSOR_CID, false, nullptr, TextInputProcessorConstructor },
   { &kNS_SCRIPTERROR_CID, false, nullptr, nsScriptErrorConstructor },
   { nullptr }
+  // clang-format on
 };
 
 static const mozilla::Module::ContractIDEntry kLayoutContracts[] = {
+  // clang-format off
   XPCONNECT_CONTRACTS
   { "@mozilla.org/inspector/deep-tree-walker;1", &kIN_DEEPTREEWALKER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "application/xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "application/xhtml+xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "image/svg+xml", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/html", &kNS_TEXT_ENCODER_CID },
   { NS_DOC_ENCODER_CONTRACTID_BASE "text/plain", &kNS_TEXT_ENCODER_CID },
@@ -676,16 +679,17 @@ static const mozilla::Module::CategoryEn
   { "app-startup", "Push Notifier", "service," PUSHNOTIFIER_CONTRACTID },
   { "clear-origin-attributes-data", "QuotaManagerService", "service," QUOTAMANAGER_SERVICE_CONTRACTID },
   { OBSERVER_TOPIC_IDLE_DAILY, "QuotaManagerService", QUOTAMANAGER_SERVICE_CONTRACTID },
   CONTENTDLF_CATEGORIES
   { "profile-after-change", "PresentationDeviceManager", PRESENTATION_DEVICE_MANAGER_CONTRACTID },
   { "profile-after-change", "PresentationService", PRESENTATION_SERVICE_CONTRACTID },
   { "profile-after-change", "Notification Telemetry Service", NOTIFICATIONTELEMETRYSERVICE_CONTRACTID },
   { nullptr }
+  // clang-format on
 };
 
 static void
 LayoutModuleDtor()
 {
   if (XRE_GetProcessType() == GeckoProcessType_GPU) {
     return;
   }
--- a/layout/xul/nsResizerFrame.cpp
+++ b/layout/xul/nsResizerFrame.cpp
@@ -487,28 +487,33 @@ nsResizerFrame::RestoreOriginalSize(nsIC
   aContent->DeleteProperty(nsGkAtoms::_moz_original_size);
 }
 
 /* returns a Direction struct containing the horizontal and vertical direction
  */
 nsResizerFrame::Direction
 nsResizerFrame::GetDirection()
 {
-  static const Element::AttrValuesArray strings[] =
-    {nsGkAtoms::topleft,    nsGkAtoms::top,    nsGkAtoms::topright,
+  static const Element::AttrValuesArray strings[] = {
+    // clang-format off
+     nsGkAtoms::topleft,    nsGkAtoms::top,    nsGkAtoms::topright,
      nsGkAtoms::left,                          nsGkAtoms::right,
      nsGkAtoms::bottomleft, nsGkAtoms::bottom, nsGkAtoms::bottomright,
      nsGkAtoms::bottomstart,                   nsGkAtoms::bottomend,
-     nullptr};
+     nullptr
+     // clang-format on
+    };
 
-  static const Direction directions[] =
-    {{-1, -1}, {0, -1}, {1, -1},
+  static const Direction directions[] = {
+    // clang-format off
+     {-1, -1}, {0, -1}, {1, -1},
      {-1,  0},          {1,  0},
      {-1,  1}, {0,  1}, {1,  1},
      {-1,  1},          {1,  1}
+     // clang-format on
     };
 
   if (!GetContent()) {
     return directions[0]; // default: topleft
   }
 
   int32_t index =
     mContent->AsElement()->FindAttrValueIn(kNameSpaceID_None,
--- a/media/psshparser/gtest/TestPsshParser.cpp
+++ b/media/psshparser/gtest/TestPsshParser.cpp
@@ -12,89 +12,100 @@
 #include "psshparser/PsshParser.h"
 #include "mozilla/ArrayUtils.h"
 
 using namespace std;
 
 // This is the CENC initData from Google's web-platform tests.
 // https://github.com/w3c/web-platform-tests/blob/master/encrypted-media/Google/encrypted-media-utils.js#L50
 const uint8_t gGoogleWPTCencInitData[] = {
+  // clang-format off
   0x00, 0x00, 0x00, 0x00,                          // size = 0
   0x70, 0x73, 0x73, 0x68,                          // 'pssh'
   0x01,                                            // version = 1
   0x00, 0x00, 0x00,                                // flags
   0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // Common SystemID
   0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
   0x00, 0x00, 0x00, 0x01,                          // key count
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,  // key
   0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
   0x00, 0x00, 0x00, 0x00                           // datasize
+  // clang-format on
 };
 
 // Example CENC initData from the EME spec format registry:
 // https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html
 const uint8_t gW3SpecExampleCencInitData[] = {
+  // clang-format off
   0x00, 0x00, 0x00, 0x44, 0x70, 0x73, 0x73, 0x68, // BMFF box header (68 bytes, 'pssh')
   0x01, 0x00, 0x00, 0x00,                         // Full box header (version = 1, flags = 0)
   0x10, 0x77, 0xef, 0xec, 0xc0, 0xb2, 0x4d, 0x02, // SystemID
   0xac, 0xe3, 0x3c, 0x1e, 0x52, 0xe2, 0xfb, 0x4b,
   0x00, 0x00, 0x00, 0x02,                         // KID_count (2)
   0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, // First KID ("0123456789012345")
   0x38, 0x39, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35,
   0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, // Second KID ("ABCDEFGHIJKLMNOP")
   0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50,
   0x00, 0x00, 0x00, 0x00                         // Size of Data (0)
+  // clang-format on
 };
 
 // Invalid box size, would overflow if used.
 const uint8_t gOverflowBoxSize[] = {
   0xff, 0xff, 0xff, 0xff,                          // size = UINT32_MAX
 };
 
 // Valid box size, but key count too large.
 const uint8_t gTooLargeKeyCountInitData[] = {
+  // clang-format off
   0x00, 0x00, 0x00, 0x34,                          // size = too big a number
   0x70, 0x73, 0x73, 0x68,                          // 'pssh'
   0x01,                                            // version = 1
   0xff, 0xff, 0xff,                                // flags
   0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // Common SystemID
   0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
   0xff, 0xff, 0xff, 0xff,                          // key count = UINT32_MAX
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  // key
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff                           // datasize
+  // clang-format on
 };
 
 // Non common SystemID PSSH.
 // No keys Ids can be extracted, but don't consider the box invalid.
 const uint8_t gNonCencInitData[] = {
+  // clang-format off
   0x00, 0x00, 0x00, 0x5c,                          // size = 92
   0x70, 0x73, 0x73, 0x68,                          // 'pssh'
   0x01,                                            // version = 1
   0x00, 0x00, 0x00,                                // flags
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  // Invalid SystemID
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  // Some data to pad out the box.
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+  // clang-format on
 };
 
 const uint8_t gNonPSSHBoxZeroSize[] = {
+  // clang-format off
   0x00, 0x00, 0x00, 0x00,                          // size = 0
   0xff, 0xff, 0xff, 0xff,                          // something other than 'pssh'
+  // clang-format on
 };
 
 // Two lots of the google init data. To ensure we handle
 // multiple boxes with size 0.
 const uint8_t g2xGoogleWPTCencInitData[] = {
+  // clang-format off
   0x00, 0x00, 0x00, 0x00,                          // size = 0
   0x70, 0x73, 0x73, 0x68,                          // 'pssh'
   0x01,                                            // version = 1
   0x00, 0x00, 0x00,                                // flags
   0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // Common SystemID
   0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
   0x00, 0x00, 0x00, 0x01,                          // key count
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,  // key
@@ -106,16 +117,17 @@ const uint8_t g2xGoogleWPTCencInitData[]
   0x01,                                            // version = 1
   0x00, 0x00, 0x00,                                // flags
   0x10, 0x77, 0xEF, 0xEC, 0xC0, 0xB2, 0x4D, 0x02,  // Common SystemID
   0xAC, 0xE3, 0x3C, 0x1E, 0x52, 0xE2, 0xFB, 0x4B,
   0x00, 0x00, 0x00, 0x01,                          // key count
   0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,  // key
   0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
   0x00, 0x00, 0x00, 0x00                           // datasize
+  // clang-format on
 };
 
 TEST(PsshParser, ParseCencInitData) {
   std::vector<std::vector<uint8_t>> keyIds;
   bool rv;
 
   rv = ParseCENCInitData(gGoogleWPTCencInitData, MOZ_ARRAY_LENGTH(gGoogleWPTCencInitData), keyIds);
   EXPECT_TRUE(rv);
--- a/media/webrtc/signaling/src/media-conduit/VideoStreamFactory.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoStreamFactory.cpp
@@ -21,23 +21,25 @@ namespace mozilla {
 // For now, try to set the max rates well above the knee in the curve.
 // Chosen somewhat arbitrarily; it's hard to find good data oriented for
 // realtime interactive/talking-head recording.  These rates assume
 // 30fps.
 
 // XXX Populate this based on a pref (which we should consider sorting because
 // people won't assume they need to).
 static VideoStreamFactory::ResolutionAndBitrateLimits kResolutionAndBitrateLimits[] = {
+  // clang-format off
   {MB_OF(1920, 1200), KBPS(1500), KBPS(2000), KBPS(10000)}, // >HD (3K, 4K, etc)
   {MB_OF(1280, 720), KBPS(1200), KBPS(1500), KBPS(5000)}, // HD ~1080-1200
   {MB_OF(800, 480), KBPS(600), KBPS(800), KBPS(2500)}, // HD ~720
   {MB_OF(480, 270), KBPS(150), KBPS(500), KBPS(2000)}, // WVGA
   {tl::Max<MB_OF(400, 240), MB_OF(352, 288)>::value, KBPS(125), KBPS(300), KBPS(1300)}, // VGA
   {MB_OF(176, 144), KBPS(100), KBPS(150), KBPS(500)}, // WQVGA, CIF
   {0 , KBPS(40), KBPS(80), KBPS(250)} // QCIF and below
+  // clang-format on
 };
 
 static VideoStreamFactory::ResolutionAndBitrateLimits
 GetLimitsFor(unsigned int aWidth, unsigned int aHeight, int aCapBps = 0)
 {
   // max bandwidth should be proportional (not linearly!) to resolution, and
   // proportional (perhaps linearly, or close) to current frame rate.
   int fs = MB_OF(aWidth, aHeight);
--- a/netwerk/build/nsNetModule.cpp
+++ b/netwerk/build/nsNetModule.cpp
@@ -755,16 +755,17 @@ NS_DEFINE_NAMED_CID(NS_NSILOADCONTEXTINF
 NS_DEFINE_NAMED_CID(NS_NETWORKPREDICTOR_CID);
 NS_DEFINE_NAMED_CID(NS_CAPTIVEPORTAL_CID);
 NS_DEFINE_NAMED_CID(NS_REQUESTCONTEXTSERVICE_CID);
 #ifdef BUILD_NETWORK_INFO_SERVICE
 NS_DEFINE_NAMED_CID(NETWORKINFOSERVICE_CID);
 #endif // BUILD_NETWORK_INFO_SERVICE
 
 static const mozilla::Module::CIDEntry kNeckoCIDs[] = {
+    // clang-format off
     { &kNS_IOSERVICE_CID, false, nullptr, nsIOServiceConstructor },
     { &kNS_STREAMTRANSPORTSERVICE_CID, false, nullptr, nsStreamTransportServiceConstructor },
     { &kNS_SOCKETTRANSPORTSERVICE_CID, false, nullptr, nsSocketTransportServiceConstructor },
     { &kNS_SERVERSOCKET_CID, false, nullptr, nsServerSocketConstructor },
     { &kNS_TLSSERVERSOCKET_CID, false, nullptr, TLSServerSocketConstructor },
     { &kNS_UDPSOCKET_CID, false, nullptr, nsUDPSocketConstructor },
     { &kNS_SOCKETPROVIDERSERVICE_CID, false, nullptr, nsSocketProviderService::Create },
     { &kNS_DNSSERVICE_CID, false, nullptr, nsIDNSServiceConstructor },
@@ -871,19 +872,21 @@ static const mozilla::Module::CIDEntry k
     { &kNS_NSILOADCONTEXTINFOFACTORY_CID, false, nullptr, LoadContextInfoFactoryConstructor },
     { &kNS_NETWORKPREDICTOR_CID, false, nullptr, mozilla::net::Predictor::Create },
     { &kNS_CAPTIVEPORTAL_CID, false, nullptr, mozilla::net::nsICaptivePortalServiceConstructor },
     { &kNS_REQUESTCONTEXTSERVICE_CID, false, nullptr, RequestContextServiceConstructor },
 #ifdef BUILD_NETWORK_INFO_SERVICE
     { &kNETWORKINFOSERVICE_CID, false, nullptr, nsNetworkInfoServiceConstructor },
 #endif
     { nullptr }
+    // clang-format on
 };
 
 static const mozilla::Module::ContractIDEntry kNeckoContracts[] = {
+    // clang-format off
     { NS_IOSERVICE_CONTRACTID, &kNS_IOSERVICE_CID },
     { NS_NETUTIL_CONTRACTID, &kNS_IOSERVICE_CID },
     { NS_STREAMTRANSPORTSERVICE_CONTRACTID, &kNS_STREAMTRANSPORTSERVICE_CID },
     { NS_SOCKETTRANSPORTSERVICE_CONTRACTID, &kNS_SOCKETTRANSPORTSERVICE_CID },
     { NS_SERVERSOCKET_CONTRACTID, &kNS_SERVERSOCKET_CID },
     { NS_TLSSERVERSOCKET_CONTRACTID, &kNS_TLSSERVERSOCKET_CID },
     { NS_UDPSOCKET_CONTRACTID, &kNS_UDPSOCKET_CID },
     { NS_SOCKETPROVIDERSERVICE_CONTRACTID, &kNS_SOCKETPROVIDERSERVICE_CID },
@@ -987,16 +990,17 @@ static const mozilla::Module::ContractID
     { NS_NSILOADCONTEXTINFOFACTORY_CONTRACTID, &kNS_NSILOADCONTEXTINFOFACTORY_CID },
     { NS_NETWORKPREDICTOR_CONTRACTID, &kNS_NETWORKPREDICTOR_CID },
     { NS_CAPTIVEPORTAL_CONTRACTID, &kNS_CAPTIVEPORTAL_CID },
     { NS_REQUESTCONTEXTSERVICE_CONTRACTID, &kNS_REQUESTCONTEXTSERVICE_CID },
 #ifdef BUILD_NETWORK_INFO_SERVICE
     { NETWORKINFOSERVICE_CONTRACT_ID, &kNETWORKINFOSERVICE_CID },
 #endif
     { nullptr }
+    // clang-format on
 };
 
 static const mozilla::Module kNeckoModule = {
     mozilla::Module::kVersion,
     kNeckoCIDs,
     kNeckoContracts,
     kNeckoCategories,
     nullptr,
--- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp
+++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
@@ -1296,16 +1296,17 @@ nsOfflineCacheDevice::InitWithSqlite(moz
   mEvictionFunction = new nsOfflineCacheEvictionFunction(this);
   if (!mEvictionFunction) return NS_ERROR_OUT_OF_MEMORY;
 
   rv = mDB->CreateFunction(NS_LITERAL_CSTRING("cache_eviction_observer"), 3, mEvictionFunction);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // create all (most) of our statements up front
   StatementSql prepared[] = {
+    // clang-format off
     StatementSql ( mStatement_CacheSize,         "SELECT Sum(DataSize) from moz_cache;" ),
     StatementSql ( mStatement_ApplicationCacheSize, "SELECT Sum(DataSize) from moz_cache WHERE ClientID = ?;" ),
     StatementSql ( mStatement_EntryCount,        "SELECT count(*) from moz_cache;" ),
     StatementSql ( mStatement_UpdateEntry,       "UPDATE moz_cache SET MetaData = ?, DataSize = ?, FetchCount = ?, LastFetched = ?, LastModified = ?, ExpirationTime = ? WHERE ClientID = ? AND Key = ?;" ),
     StatementSql ( mStatement_UpdateEntrySize,   "UPDATE moz_cache SET DataSize = ? WHERE ClientID = ? AND Key = ?;" ),
     StatementSql ( mStatement_DeleteEntry,       "DELETE FROM moz_cache WHERE ClientID = ? AND Key = ?;" ),
     StatementSql ( mStatement_FindEntry,         "SELECT MetaData, Generation, DataSize, FetchCount, LastFetched, LastModified, ExpirationTime, ItemType FROM moz_cache WHERE ClientID = ? AND Key = ?;" ),
     StatementSql ( mStatement_BindEntry,         "INSERT INTO moz_cache (ClientID, Key, MetaData, Generation, DataSize, FetchCount, LastFetched, LastModified, ExpirationTime) VALUES(?,?,?,?,?,?,?,?,?);" ),
@@ -1330,16 +1331,17 @@ nsOfflineCacheDevice::InitWithSqlite(moz
     StatementSql ( mStatement_FindNamespaceEntry,    "SELECT NameSpace, Data, ItemType FROM moz_cache_namespaces"
                                                      " WHERE ClientID = ?1"
                                                      " AND NameSpace <= ?2 AND ?2 GLOB NameSpace || '*'"
                                                      " ORDER BY NameSpace DESC;"),
     StatementSql ( mStatement_InsertNamespaceEntry,  "INSERT INTO moz_cache_namespaces (ClientID, NameSpace, Data, ItemType) VALUES(?, ?, ?, ?);"),
     StatementSql ( mStatement_EnumerateApps,         "SELECT GroupID, ActiveClientID FROM moz_cache_groups WHERE GroupID LIKE ?1;"),
     StatementSql ( mStatement_EnumerateGroups,       "SELECT GroupID, ActiveClientID FROM moz_cache_groups;"),
     StatementSql ( mStatement_EnumerateGroupsTimeOrder, "SELECT GroupID, ActiveClientID FROM moz_cache_groups ORDER BY ActivateTimeStamp;")
+    // clang-format on
   };
   for (uint32_t i = 0; NS_SUCCEEDED(rv) && i < ArrayLength(prepared); ++i)
   {
     LOG(("Creating statement: %s\n", prepared[i].sql));
 
     rv = mDB->CreateStatement(nsDependentCString(prepared[i].sql),
                               getter_AddRefs(prepared[i].statement));
     NS_ENSURE_SUCCESS(rv, rv);
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -170,26 +170,28 @@ enum CacheDisposition {
 };
 
 using mozilla::Telemetry::LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED;
 
 static const struct {
   LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED mTelemetryLabel;
   const char* mHostName;
 } gFastBlockAnalyticsProviders[] = {
+  // clang-format off
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::googleanalytics, "google-analytics.com" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::scorecardresearch, "scorecardresearch.com" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::hotjar, "hotjar.com" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::newrelic, "newrelic.com" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::nrdata, "nr-data.net" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::crwdcntrl, "crwdcntrl.net" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::eyeota, "eyeota.net" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::yahooanalytics, "analytics.yahoo.com" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::statcounter, "statcounter.com" },
   { LABELS_DOCUMENT_ANALYTICS_TRACKER_FASTBLOCKED::v12group, "v12group.com" }
+  // clang-format on
 };
 
 void
 AccumulateCacheHitTelemetry(CacheDisposition hitOrMiss)
 {
     Telemetry::Accumulate(Telemetry::HTTP_CACHE_DISPOSITION_2_V2, hitOrMiss);
 }
 
--- a/xpcom/base/MemoryMapping.cpp
+++ b/xpcom/base/MemoryMapping.cpp
@@ -18,16 +18,17 @@ namespace {
 struct VMFlagString
 {
   const char* mName;
   const char* mPrettyName;
   VMFlag mFlag;
 };
 
 static const VMFlagString sVMFlagStrings[] = {
+  // clang-format off
   {"ac", "Accountable",   VMFlag::Accountable},
   {"ar", "ArchSpecific",  VMFlag::ArchSpecific},
   {"dc", "NoFork",        VMFlag::NoFork},
   {"dd", "NoCore",        VMFlag::NoCore},
   {"de", "NoExpand",      VMFlag::NoExpand},
   {"dw", "DisabledWrite", VMFlag::DisabledWrite},
   {"ex", "Executable",    VMFlag::Executable},
   {"gd", "GrowsDown",     VMFlag::GrowsDown},
@@ -46,24 +47,26 @@ static const VMFlagString sVMFlagStrings
   {"nr", "NotReserved",   VMFlag::NotReserved},
   {"pf", "PurePFN",       VMFlag::PurePFN},
   {"rd", "Readable",      VMFlag::Readable},
   {"rr", "Random",        VMFlag::Random},
   {"sd", "SoftDirty",     VMFlag::SoftDirty},
   {"sh", "Shared",        VMFlag::Shared},
   {"sr", "Sequential",    VMFlag::Sequential},
   {"wr", "Writable",      VMFlag::Writable},
+  // clang-format on
 };
 } // anonymous namespace
 
 constexpr size_t kVMFlags = size_t(-1);
 
 // An array of known field names which may be present in an smaps file, and the
 // offsets of the corresponding fields in a MemoryMapping class.
 const MemoryMapping::Field MemoryMapping::sFields[] = {
+  // clang-format off
   {"AnonHugePages",   offsetof(MemoryMapping, mAnonHugePages)},
   {"Anonymous",       offsetof(MemoryMapping, mAnonymous)},
   {"KernelPageSize",  offsetof(MemoryMapping, mKernelPageSize)},
   {"LazyFree",        offsetof(MemoryMapping, mLazyFree)},
   {"Locked",          offsetof(MemoryMapping, mLocked)},
   {"MMUPageSize",     offsetof(MemoryMapping, mMMUPageSize)},
   {"Private_Clean",   offsetof(MemoryMapping, mPrivate_Clean)},
   {"Private_Dirty",   offsetof(MemoryMapping, mPrivate_Dirty)},
@@ -78,16 +81,17 @@ const MemoryMapping::Field MemoryMapping
   {"Size",            offsetof(MemoryMapping, mSize)},
   {"Swap",            offsetof(MemoryMapping, mSwap)},
   {"SwapPss",         offsetof(MemoryMapping, mSwapPss)},
   // VmFlags is a special case. It contains an array of flag strings, which
   // describe attributes of the mapping, rather than a mapping size. We include
   // it in this array to aid in parsing, but give it a separate sentinel value,
   // and treat it specially.
   {"VmFlags",         kVMFlags},
+  // clang-format on
 };
 
 template <typename T, int n>
 const T*
 FindEntry(const char* aName, const T (&aEntries)[n])
 {
   size_t index;
   if (BinarySearchIf(aEntries, 0, n,
--- a/xpcom/build/mach_override.c
+++ b/xpcom/build/mach_override.c
@@ -556,16 +556,17 @@ setBranchIslandTarget_i386(
 typedef struct {
 	unsigned int length; // max 15
 	unsigned char mask[15]; // sequence of bytes in memory order
 	unsigned char constraint[15]; // sequence of bytes in memory order
 }	AsmInstructionMatch;
 
 #if defined(__i386__)
 static AsmInstructionMatch possibleInstructions[] = {
+	// clang-format off
 	{ 0x5, {0xFF, 0x00, 0x00, 0x00, 0x00}, {0xE9, 0x00, 0x00, 0x00, 0x00} },	// jmp 0x????????
 	{ 0x5, {0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, {0x55, 0x89, 0xe5, 0xc9, 0xc3} },	// push %ebp; mov %esp,%ebp; leave; ret
 	{ 0x1, {0xFF}, {0x90} },							// nop
 	{ 0x1, {0xFF}, {0x55} },							// push %esp
 	{ 0x2, {0xFF, 0xFF}, {0x89, 0xE5} },				                // mov %esp,%ebp
 	{ 0x1, {0xFF}, {0x53} },							// push %ebx
 	{ 0x3, {0xFF, 0xFF, 0x00}, {0x83, 0xEC, 0x00} },	                        // sub 0x??, %esp
 	{ 0x6, {0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00}, {0x81, 0xEC, 0x00, 0x00, 0x00, 0x00} },	// sub 0x??, %esp with 32bit immediate
@@ -573,19 +574,21 @@ static AsmInstructionMatch possibleInstr
 	{ 0x1, {0xFF}, {0x56} },							// push %esi
 	{ 0x2, {0xFF, 0xFF}, {0x31, 0xC0} },						// xor %eax, %eax
 	{ 0x3, {0xFF, 0x4F, 0x00}, {0x8B, 0x45, 0x00} },  // mov $imm(%ebp), %reg
 	{ 0x3, {0xFF, 0x4C, 0x00}, {0x8B, 0x40, 0x00} },  // mov $imm(%eax-%edx), %reg
 	{ 0x4, {0xFF, 0xFF, 0xFF, 0x00}, {0x8B, 0x4C, 0x24, 0x00} },  // mov $imm(%esp), %ecx
 	{ 0x5, {0xFF, 0x00, 0x00, 0x00, 0x00}, {0xB8, 0x00, 0x00, 0x00, 0x00} },	// mov $imm, %eax
 	{ 0x6, {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, {0xE8, 0x00, 0x00, 0x00, 0x00, 0x58} },	// call $imm; pop %eax
 	{ 0x0 }
+	// clang-format on
 };
 #elif defined(__x86_64__)
 static AsmInstructionMatch possibleInstructions[] = {
+	// clang-format off
 	{ 0x5, {0xFF, 0x00, 0x00, 0x00, 0x00}, {0xE9, 0x00, 0x00, 0x00, 0x00} },	// jmp 0x????????
 	{ 0x1, {0xFF}, {0x90} },							// nop
 	{ 0x1, {0xF8}, {0x50} },							// push %rX
 	{ 0x3, {0xFF, 0xFF, 0xFF}, {0x48, 0x89, 0xE5} },				// mov %rsp,%rbp
 	{ 0x4, {0xFF, 0xFF, 0xFF, 0x00}, {0x48, 0x83, 0xEC, 0x00} },	                // sub 0x??, %rsp
 	{ 0x4, {0xFB, 0xFF, 0x00, 0x00}, {0x48, 0x89, 0x00, 0x00} },	                // move onto rbp
 	{ 0x4, {0xFF, 0xFF, 0xFF, 0xFF}, {0x40, 0x0f, 0xbe, 0xce} },			// movsbl %sil, %ecx
 	{ 0x2, {0xFF, 0x00}, {0x41, 0x00} },						// push %rXX
@@ -594,16 +597,17 @@ static AsmInstructionMatch possibleInstr
 	{ 0x3, {0xFF, 0xFF, 0x00}, {0xFF, 0x77, 0x00} },  // pushq $imm(%rdi)
 	{ 0x2, {0xFF, 0xFF}, {0x31, 0xC0} },						// xor %eax, %eax
 	{ 0x2, {0xFF, 0xFF}, {0x89, 0xF8} },			// mov %edi, %eax
 
 	//leaq offset(%rip),%rax
 	{ 0x7, {0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00}, {0x48, 0x8d, 0x05, 0x00, 0x00, 0x00, 0x00} },
 
 	{ 0x0 }
+	// clang-format on
 };
 #endif
 
 static Boolean codeMatchesInstruction(unsigned char *code, AsmInstructionMatch* instruction)
 {
 	Boolean match = true;
 
 	size_t i;
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -56,16 +56,17 @@ struct ManifestDirective
   void (nsComponentManagerImpl::*mgrfunc)(
     nsComponentManagerImpl::ManifestProcessingContext& aCx,
     int aLineNo, char* const* aArgv);
   void (nsChromeRegistry::*regfunc)(
     nsChromeRegistry::ManifestProcessingContext& aCx,
     int aLineNo, char* const* aArgv, int aFlags);
 };
 static const ManifestDirective kParsingTable[] = {
+  // clang-format off
   {
     "manifest",         1, true, false,
     &nsComponentManagerImpl::ManifestManifest, nullptr,
   },
   {
     "component",        2, false, false,
     &nsComponentManagerImpl::ManifestComponent, nullptr,
   },
@@ -94,16 +95,17 @@ static const ManifestDirective kParsingT
     // to use it for chrome://../skin/ URLs
     "override",         2, true, false,
     nullptr, &nsChromeRegistry::ManifestOverride,
   },
   {
     "resource",         2, false, true,
     nullptr, &nsChromeRegistry::ManifestResource,
   }
+  // clang-format on
 };
 
 static const char kWhitespace[] = "\t ";
 
 static bool
 IsNewline(char aChar)
 {
   return aChar == '\n' || aChar == '\r';
--- a/xpcom/io/nsLocalFileWin.cpp
+++ b/xpcom/io/nsLocalFileWin.cpp
@@ -2894,16 +2894,17 @@ nsLocalFile::IsExecutable(bool* aResult)
     // Convert extension to lower case.
     char16_t* p = path.BeginWriting();
     for (p += dotIdx + 1; *p; ++p) {
       *p += (*p >= L'A' && *p <= L'Z') ? 'a' - 'A' : 0;
     }
 
     // Search for any of the set of executable extensions.
     static const char* const executableExts[] = {
+      // clang-format off
       "ad",
       "ade",         // access project extension
       "adp",
       "air",         // Adobe AIR installer
       "app",         // executable application
       "application", // from bug 348763
       "asp",
       "bas",
@@ -2969,16 +2970,17 @@ nsLocalFile::IsExecutable(bool* aResult)
       "vsmacros",    // Visual Studio .NET Binary-based Macro Project
       "vss",
       "vst",
       "vsw",
       "ws",
       "wsc",
       "wsf",
       "wsh"
+      // clang-format on
     };
     nsDependentSubstring ext = Substring(path, dotIdx + 1);
     for (size_t i = 0; i < ArrayLength(executableExts); ++i) {
       if (ext.EqualsASCII(executableExts[i])) {
         // Found a match.  Set result and quit.
         *aResult = true;
         break;
       }
--- a/xpcom/rust/gtest/bench-collections/Bench.cpp
+++ b/xpcom/rust/gtest/bench-collections/Bench.cpp
@@ -217,22 +217,24 @@ void Bench_Rust_FxHashSet(const Params* 
 }
 
 static const size_t VALS_LEN = 131072;
 
 // Each benchmark measures a different aspect of performance.
 // Note that no "Inserts" value can exceed VALS_LEN.
 // Also, if any failing lookups are done, Inserts must be <= VALS_LEN/2.
 const Params gParamsList[] = {
+  // clang-format off
   //                           Successful Failing              Remove
   //                 Inserts   lookups    lookups  Iterations  inserts
   { "succ_lookups",  1024,     5000,      0,       0,          false },
   { "fail_lookups",  1024,     0,         5000,    0,          false },
   { "insert_remove", VALS_LEN, 0,         0,       0,          true  },
   { "iterate",       1024,     0,         0,       5000,       false },
+  // clang-format on
 };
 
 class BenchCollections : public ::testing::Test
 {
 protected:
   void SetUp() override
   {
     StaticMutexAutoLock lock(sValsMutex);