Bug 1628961 - Replace "clang-format off" with semicolon workaround for clang-format bug 1629756. r=smaug
authorChris Peterson <cpeterson@mozilla.com>
Thu, 16 Apr 2020 09:49:35 +0000
changeset 524552 40177ff41c87dea585f9c428882d4e7efd8c96c3
parent 524551 5ff2af14358ee98d57e9e06f38724b31c25500a3
child 524553 458f9c1098bced8d78d106d0b8ff958bd1e2531d
push id37323
push userdluca@mozilla.com
push dateFri, 17 Apr 2020 16:25:55 +0000
treeherdermozilla-central@b4b1d6f91ef0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1628961, 1629756
milestone77.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 1628961 - Replace "clang-format off" with semicolon workaround for clang-format bug 1629756. r=smaug Differential Revision: https://phabricator.services.mozilla.com/D71138
uriloader/base/nsDocLoader.h
--- a/uriloader/base/nsDocLoader.h
+++ b/uriloader/base/nsDocLoader.h
@@ -81,26 +81,23 @@ class nsDocLoader : public nsIDocumentLo
   NS_DECL_NSIPROGRESSEVENTSINK
 
   // nsIRequestObserver methods: (for observing the load group)
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSIWEBPROGRESS
 
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSICHANNELEVENTSINK
-  // Turn off clang-format to work around [[nodiscard]] bug 1629756.
-  // clang-format off
-  NS_DECL_NSISUPPORTSPRIORITY
+  NS_DECL_NSISUPPORTSPRIORITY;  // semicolon for clang-format bug 1629756
 
   // Implementation specific methods...
 
   // Remove aChild from our childlist.  This nulls out the child's mParent
   // pointer.
   [[nodiscard]] nsresult RemoveChildLoader(nsDocLoader* aChild);
-  // clang-format on
 
   // Add aChild to our child list.  This will set aChild's mParent pointer to
   // |this|.
   [[nodiscard]] nsresult AddChildLoader(nsDocLoader* aChild);
   nsDocLoader* GetParent() const { return mParent; }
 
   struct nsListenerInfo {
     nsListenerInfo(nsIWeakReference* aListener, unsigned long aNotifyMask)