rename from js/public/Fifo.h
rename to js/src/ds/Fifo.h

rename from js/public/TraceableFifo.h
rename to js/src/ds/TraceableFifo.h
--- a/js/public/TraceableFifo.h
+++ b/js/src/ds/TraceableFifo.h
@@ -2,18 +2,18 @@
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef js_TraceableFifo_h
 #define js_TraceableFifo_h
 
+#include "ds/Fifo.h"
 #include "js/RootingAPI.h"
-#include "js/Fifo.h"
 
 namespace js {
 
 template <typename, typename> struct DefaultTracer;
 
 // A TraceableFifo is a Fifo with an additional trace method that knows how to
 // visit all of the items stored in the Fifo. For Fifos that contain GC things,
 // this is usually more convenient than manually iterating and marking the

--- a/js/src/jsapi-tests/testGCExactRooting.cpp
+++ b/js/src/jsapi-tests/testGCExactRooting.cpp
@@ -1,17 +1,17 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 * vim: set ts=8 sts=4 et sw=4 tw=99:
 */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "ds/TraceableFifo.h"
 #include "js/RootingAPI.h"
-#include "js/TraceableFifo.h"
 #include "js/TraceableHashTable.h"
 #include "js/TraceableVector.h"
 
 #include "jsapi-tests/tests.h"
 
 BEGIN_TEST(testGCExactRooting)
 {
     JS::RootedObject rootCx(cx, JS_NewPlainObject(cx));

--- a/js/src/moz.build
+++ b/js/src/moz.build
@@ -103,32 +103,30 @@ EXPORTS += [
 EXPORTS.js += [
     '../public/CallArgs.h',
     '../public/CallNonGenericMethod.h',
     '../public/CharacterEncoding.h',
     '../public/Class.h',
     '../public/Conversions.h',
     '../public/Date.h',
     '../public/Debug.h',
-    '../public/Fifo.h',
     '../public/GCAPI.h',
     '../public/HashTable.h',
     '../public/HeapAPI.h',
     '../public/Id.h',
     '../public/LegacyIntTypes.h',
     '../public/MemoryMetrics.h',
     '../public/Principals.h',
     '../public/ProfilingFrameIterator.h',
     '../public/ProfilingStack.h',
     '../public/Proxy.h',
     '../public/RequiredDefines.h',
     '../public/RootingAPI.h',
     '../public/SliceBudget.h',
     '../public/StructuredClone.h',
-    '../public/TraceableFifo.h',
     '../public/TraceableHashTable.h',
     '../public/TraceableVector.h',
     '../public/TraceKind.h',
     '../public/TracingAPI.h',
     '../public/TrackedOptimizationInfo.h',
     '../public/TypeDecls.h',
     '../public/UbiNode.h',
     '../public/UbiNodeTraverse.h',

--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -1739,18 +1739,17 @@ Debugger::appendAllocationSite(JSContext
         AutoCompartment ac(cx, obj);
         if (!obj->constructorDisplayAtom(cx, &ctorName))
             return false;
     }
 
     auto className = obj->getClass()->name;
     auto size = JS::ubi::Node(obj.get()).size(cx->runtime()->debuggerMallocSizeOf);
 
-    if (!allocationsLog.emplaceBack(wrappedFrame, when, className, ctorName, size))
-    {
+    if (!allocationsLog.emplaceBack(wrappedFrame, when, className, ctorName, size)) {
         ReportOutOfMemory(cx);
         return false;
     }
 
     if (allocationsLog.length() > maxAllocationsLogLength) {
         if (!allocationsLog.popFront()) {
             ReportOutOfMemory(cx);
             return false;

--- a/js/src/vm/Debugger.h
+++ b/js/src/vm/Debugger.h
@@ -14,22 +14,22 @@
 #include "mozilla/Vector.h"
 
 #include "jsclist.h"
 #include "jscntxt.h"
 #include "jscompartment.h"
 #include "jsweakmap.h"
 #include "jswrapper.h"
 
+#include "ds/TraceableFifo.h"
 #include "gc/Barrier.h"
 #include "js/Debug.h"
 #include "js/HashTable.h"
 #include "vm/GlobalObject.h"
 #include "vm/SavedStacks.h"
-#include "js/TraceableFifo.h"
 
 enum JSTrapStatus {
     JSTRAP_ERROR,
     JSTRAP_CONTINUE,
     JSTRAP_RETURN,
     JSTRAP_THROW,
     JSTRAP_LIMIT
 };