From a495cd8cb4beebb6eac232c969722f730a5e52b9 Mon Sep 17 00:00:00 2001 From: Ben Grant Date: Tue, 4 Mar 2025 11:26:34 -0800 Subject: [PATCH] reduce banned words --- src/bake/FrameworkRouter.zig | 2 +- src/bun.js/node/assert/myers_diff.zig | 4 ---- src/bun.zig | 1 + src/css/selectors/parser.zig | 2 +- src/resolver/resolver.zig | 2 +- test/internal/ban-words.test.ts | 4 ++-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bake/FrameworkRouter.zig b/src/bake/FrameworkRouter.zig index 582a20c1e0..383060be6e 100644 --- a/src/bake/FrameworkRouter.zig +++ b/src/bake/FrameworkRouter.zig @@ -573,7 +573,7 @@ pub const Style = union(enum) { if (is_optional and !is_catch_all) return log.fail("Optional parameters can only be catch-all (change to \"[[...{s}]]\" or remove extra brackets)", .{param_name}, start, len); // Potential future proofing - if (std.mem.indexOfAny(u8, param_name, "?*{}()=:#,")) |bad_char_index| + if (bun.strings.indexOfAny(param_name, "?*{}()=:#,")) |bad_char_index| return log.fail("Parameter name cannot contain \"{c}\"", .{param_name[bad_char_index]}, start + bad_char_index, 1); if (has_ending_double_bracket and !is_optional) diff --git a/src/bun.js/node/assert/myers_diff.zig b/src/bun.js/node/assert/myers_diff.zig index 4b51c63dd6..d99dae7b32 100644 --- a/src/bun.js/node/assert/myers_diff.zig +++ b/src/bun.js/node/assert/myers_diff.zig @@ -11,7 +11,6 @@ const mem = std.mem; const Allocator = mem.Allocator; const stackFallback = std.heap.stackFallback; const assert = std.debug.assert; -const print = std.debug.print; /// Comptime diff configuration. Defaults are usually sufficient. pub const Options = struct { @@ -600,9 +599,6 @@ test StrDiffer { } var d = try StrDiffer.diff(a, actual.items, expected.items); defer d.deinit(); - for (d.items) |diff| { - std.debug.print("{}\n", .{diff}); - } } } diff --git a/src/bun.zig b/src/bun.zig index e9d793ed4a..eae7da92c7 100644 --- a/src/bun.zig +++ b/src/bun.zig @@ -3748,6 +3748,7 @@ pub const libdeflate = @import("./deps/libdeflate.zig"); pub const bake = @import("bake/bake.zig"); /// like std.enums.tagName, except it doesn't lose the sentinel value. +/// delete this if https://github.com/ziglang/zig/pull/23083 lands pub fn tagName(comptime Enum: type, value: Enum) ?[:0]const u8 { return inline for (@typeInfo(Enum).@"enum".fields) |f| { if (@intFromEnum(value) == f.value) break f.name; diff --git a/src/css/selectors/parser.zig b/src/css/selectors/parser.zig index a5bc5745b4..65a1aa7798 100644 --- a/src/css/selectors/parser.zig +++ b/src/css/selectors/parser.zig @@ -3070,7 +3070,7 @@ pub fn parse_attribute_selector(comptime Impl: type, parser: *SelectorParser, in }; const never_matches = switch (operator) { .equal, .dash_match => false, - .includes => value_str.len == 0 or std.mem.indexOfAny(u8, value_str, SELECTOR_WHITESPACE) != null, + .includes => value_str.len == 0 or bun.strings.indexOfAny(value_str, SELECTOR_WHITESPACE) != null, .prefix, .substring, .suffix => value_str.len == 0, }; diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index 2c8a42806a..ef9fbcd55f 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -882,7 +882,7 @@ pub const Resolver = struct { // Fragments in URLs in CSS imports are technically expected to work if (tmp == .not_found and kind.isFromCSS()) try_without_suffix: { // If resolution failed, try again with the URL query and/or hash removed - const maybe_suffix = std.mem.indexOfAny(u8, import_path, "?#"); + const maybe_suffix = bun.strings.indexOfAny(import_path, "?#"); if (maybe_suffix == null or maybe_suffix.? < 1) break :try_without_suffix; diff --git a/test/internal/ban-words.test.ts b/test/internal/ban-words.test.ts index 067fe55446..ee597d0a30 100644 --- a/test/internal/ban-words.test.ts +++ b/test/internal/ban-words.test.ts @@ -7,8 +7,8 @@ const words: Record '@import("root").bun.': { reason: "Only import 'bun' once" }, "std.debug.assert": { reason: "Use bun.assert instead", limit: 25 }, "std.debug.dumpStackTrace": { reason: "Use bun.handleErrorReturnTrace or bun.crash_handler.dumpStackTrace instead" }, - "std.debug.print": { reason: "Don't let this be committed", limit: 2 }, - "std.mem.indexOfAny(u8": { reason: "Use bun.strings.indexOfAny", limit: 3 }, + "std.debug.print": { reason: "Don't let this be committed" }, + "std.mem.indexOfAny(u8": { reason: "Use bun.strings.indexOfAny" }, "undefined != ": { reason: "This is by definition Undefined Behavior." }, "undefined == ": { reason: "This is by definition Undefined Behavior." }, "bun.toFD(std.fs.cwd().fd)": { reason: "Use bun.FD.cwd()" },