--- a/js/src/frontend/TokenStream.h
+++ b/js/src/frontend/TokenStream.h
@@ -186,25 +186,25 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Casting.h"
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/MemoryChecking.h"
 #include "mozilla/PodOperations.h"
 #include "mozilla/Span.h"
 #include "mozilla/TextUtils.h"
-#include "mozilla/TypeTraits.h"
 #include "mozilla/Unused.h"
 #include "mozilla/Utf8.h"
 
 #include <algorithm>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <type_traits>
 
 #include "jspubtd.h"
 
 #include "frontend/ErrorReporter.h"
 #include "frontend/Token.h"
 #include "frontend/TokenKind.h"
 #include "js/CompileOptions.h"
 #include "js/HashTable.h"    // js::HashMap
@@ -273,17 +273,17 @@ class TokenStreamShared {
     MOZ_ASSERT(
         modifier == nextToken.modifier || modifier == SlashIsInvalid,
         "This token was scanned with both SlashIsRegExp and SlashIsDiv, "
         "indicating the parser is confused about how to handle a slash here. "
         "See comment at Token::Modifier.");
   }
 };
 
-static_assert(mozilla::IsEmpty<TokenStreamShared>::value,
+static_assert(std::is_empty_v<TokenStreamShared>,
               "TokenStreamShared shouldn't bloat classes that inherit from it");
 
 template <typename Unit, class AnyCharsAccess>
 class TokenStreamSpecific;
 
 template <typename Unit>
 class MOZ_STACK_CLASS TokenStreamPosition final {
  public: