update ftl migration

zackees · zackees · commit d70705c707a3 · 2025-11-16T17:39:34.000-08:00
diff --git a/src/fl/corkscrew.h b/src/fl/corkscrew.h
@@ -29,7 +29,7 @@
  * - gapParams: Optional gap compensation for solder points in a strip.
  */
 
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fl/geometry.h"
 #include "ftl/math.h"
 #include "fl/math_macros.h"
diff --git a/src/fl/grid.h b/src/fl/grid.h
@@ -3,7 +3,7 @@
 
 #include "ftl/span.h"
 #include "ftl/vector.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 
 namespace fl {
 
diff --git a/src/fl/lut.h b/src/fl/lut.h
@@ -4,7 +4,7 @@
 LUT - Look up table implementation for various types.
 */
 
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fl/force_inline.h"
 #include "ftl/shared_ptr.h"         // For FASTLED_SHARED_PTR macros
 #include "ftl/unique_ptr.h"  // For fl::unique_ptr<T>
diff --git a/src/fl/rbtree.h b/src/fl/rbtree.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ftl/algorithm.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/assert.h"
 #include "ftl/comparators.h"
 #include "ftl/initializer_list.h"
diff --git a/src/fl/rectangular_draw_buffer.cpp b/src/fl/rectangular_draw_buffer.cpp
@@ -1,6 +1,6 @@
 
 #include "fl/rectangular_draw_buffer.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "rgbw.h"
 #include "fl/str.h"
 #include "ftl/cstring.h"  // for fl::memset()
diff --git a/src/fl/scoped_array.h b/src/fl/scoped_array.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/new.h"
 #include "fl/deprecated.h"
 #include "ftl/cstddef.h"
diff --git a/src/fl/slice.h b/src/fl/slice.h
@@ -4,7 +4,7 @@
 #include "ftl/stdint.h"
 #include "fl/clamp.h"
 #include "fl/geometry.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/type_traits.h"
 
 namespace fl {
diff --git a/src/ftl/allocator.cpp b/src/ftl/allocator.cpp
@@ -1,4 +1,4 @@
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fl/int.h"
 #include "fl/thread_local.h"
 #include "ftl/cstddef.h"
diff --git a/src/ftl/allocator.h b/src/ftl/allocator.h
diff --git a/src/ftl/array.h b/src/ftl/array.h
@@ -4,7 +4,7 @@
 #include "ftl/type_traits.h"
 #include "ftl/bit_cast.h"
 #include "ftl/new.h"   // for placement new operator
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 
 #include "ftl/initializer_list.h"
 #include "fl/alloca.h"
diff --git a/src/ftl/deque.h b/src/ftl/deque.h
@@ -3,7 +3,7 @@
 
 #include "ftl/stdint.h"
 
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/initializer_list.h"
 #include "ftl/new.h"
 #include "ftl/move.h"
diff --git a/src/ftl/list.h b/src/ftl/list.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ftl/stdint.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/initializer_list.h"
 #include "ftl/new.h"
 #include "ftl/move.h"
diff --git a/src/ftl/map.h b/src/ftl/map.h
@@ -10,7 +10,7 @@
 #include "ftl/type_traits.h"
 #include "ftl/vector.h"
 #include "fl/rbtree.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 
 namespace fl {
 
diff --git a/src/ftl/set.h b/src/ftl/set.h
@@ -5,7 +5,7 @@
 #include "ftl/vector.h"
 #include "ftl/map.h"
 #include "fl/rbtree.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/pair.h"
 
 
diff --git a/src/ftl/unordered_set.h b/src/ftl/unordered_set.h
@@ -4,7 +4,7 @@
 
 #include "ftl/vector.h"
 #include "ftl/hash_map.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 
 namespace fl {
 
diff --git a/src/ftl/vector.h b/src/ftl/vector.h
@@ -8,7 +8,7 @@
 #include "fl/insert_result.h"
 #include "fl/math_macros.h"
 #include "ftl/cstring.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/scoped_ptr.h"
 #include "ftl/type_traits.h"
 #include "ftl/new.h"
diff --git a/src/fx/2d/scale_up.cpp b/src/fx/2d/scale_up.cpp
@@ -7,7 +7,7 @@
 #include "ftl/memory.h"
 #include "fl/xymap.h"
 #include "ftl/vector.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fx/fx2d.h"
 
 // Optimized for 2^n grid sizes in terms of both memory and performance.
diff --git a/src/fx/frame.cpp b/src/fx/frame.cpp
@@ -1,6 +1,6 @@
 
 #include "crgb.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fl/dbg.h"
 #include "fl/warn.h"
 #include "fl/xymap.h"
diff --git a/src/fx/frame.h b/src/fx/frame.h
@@ -7,7 +7,7 @@
 #include "ftl/vector.h"
 #include "ftl/stdint.h"
 
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fl/draw_mode.h"
 #include "fl/codec/pixel.h"
 
diff --git a/src/fx/fx2d_to_1d.cpp b/src/fx/fx2d_to_1d.cpp
@@ -3,7 +3,7 @@
 #include "fl/math_macros.h"
 #include "fl/xymap.h"
 #include "crgb.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 
 namespace fl {
 
diff --git a/src/platforms/arm/rp/rpcommon/clockless_rp_pio_auto.cpp b/src/platforms/arm/rp/rpcommon/clockless_rp_pio_auto.cpp
@@ -14,7 +14,7 @@
 #include "ftl/unique_ptr.h"
 #include "ftl/assert.h"
 #include "ftl/cstring.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/map.h"
 #include "fl/dbg.h"
 
diff --git a/src/platforms/esp/32/drivers/i2s/clockless_i2s_esp32s3.cpp b/src/platforms/esp/32/drivers/i2s/clockless_i2s_esp32s3.cpp
@@ -27,7 +27,7 @@
 #include "fl/warn.h"
 #include "fl/math_macros.h"
 #include "pixel_iterator.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/unique_ptr.h"
 #include "ftl/assert.h"
 #include "fl/rectangular_draw_buffer.h"
diff --git a/src/platforms/esp/32/drivers/rmt/rmt_5/buffer_pool.h b/src/platforms/esp/32/drivers/rmt/rmt_5/buffer_pool.h
@@ -4,7 +4,7 @@
 
 #if FASTLED_RMT5
 
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/span.h"
 #include "ftl/vector.h"
 #include "ftl/stdint.h"
diff --git a/src/platforms/shared/spi_types.cpp b/src/platforms/shared/spi_types.cpp
@@ -1,6 +1,6 @@
 #include "spi_types.h"
 #include "ftl/vector.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/string.h"
 #include "ftl/strstream.h"
 
diff --git a/src/third_party/libnsgif/src/gif.cpp b/src/third_party/libnsgif/src/gif.cpp
@@ -12,7 +12,7 @@
 #include "ftl/assert.h"
 #include "fl/int.h"
 #include "ftl/limits.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/cstring.h"
 #include "ftl/string.h"
 #include "fl/str.h"
diff --git a/src/third_party/libnsgif/src/lzw.cpp b/src/third_party/libnsgif/src/lzw.cpp
@@ -10,7 +10,7 @@
 #include "ftl/cstddef.h"
 #include "ftl/assert.h"
 #include "fl/int.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 
 #include "lzw.h"
 
diff --git a/tests/fl/set.cpp b/tests/fl/set.cpp
@@ -3,7 +3,7 @@
 
 #include "test.h"
 #include "ftl/set.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "fl/int.h"
 #include "ftl/bit_cast.h"
 #include <algorithm>
diff --git a/tests/ftl/allocator.cpp b/tests/ftl/allocator.cpp
@@ -1,5 +1,5 @@
 #include "test.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/vector.h"
 
 using namespace fl;
@@ -138,15 +138,30 @@ TEST_CASE("fl::allocator") {
         alloc.deallocate(result.ptr, result.count);
     }
 
-    SUBCASE("reallocate returns nullptr") {
+    SUBCASE("reallocate works for trivially copyable types") {
         allocator<int> alloc;
         int* ptr = alloc.allocate(5);
 
-        // Basic allocator's reallocate should return nullptr (not supported)
+        // Initialize data
+        for (int i = 0; i < 5; ++i) {
+            ptr[i] = i * 10;
+        }
+
+        // Basic allocator's reallocate should work for trivially copyable types (like int)
         int* new_ptr = alloc.reallocate(ptr, 5, 10);
-        CHECK_EQ(new_ptr, nullptr);
+        CHECK(new_ptr != nullptr);
 
-        alloc.deallocate(ptr, 5);
+        // Verify data was preserved
+        for (int i = 0; i < 5; ++i) {
+            CHECK_EQ(new_ptr[i], i * 10);
+        }
+
+        // Verify new memory is zero-initialized
+        for (int i = 5; i < 10; ++i) {
+            CHECK_EQ(new_ptr[i], 0);
+        }
+
+        alloc.deallocate(new_ptr, 10);
     }
 
     SUBCASE("rebind allocator") {
@@ -1193,7 +1208,7 @@ TEST_CASE("fl::allocator integration with vector") {
     }
 }
 #include "test.h"
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 #include "ftl/vector.h"
 
 
diff --git a/tests/fx/frame.cpp b/tests/fx/frame.cpp
@@ -6,7 +6,7 @@
 #include "test.h"
 #include "fx/frame.h"
 #include <cstdlib>
-#include "fl/allocator.h"
+#include "ftl/allocator.h"
 using namespace fl;
 namespace {
     int allocation_count = 0;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "fl/allocator.h"`
	`1`	`+#include "ftl/allocator.h"`
`2`	`2`	`#include "fl/int.h"`
`3`	`3`	`#include "fl/thread_local.h"`
`4`	`4`	`#include "ftl/cstddef.h"`