mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-07 22:34:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #24387 from ziglang/std.log.default_level

Browse source 
std.log: adjust default level for ReleaseSmall to include info + bonus cleanup
This commit is contained in:
Andrew Kelley 2025-07-10 14:56:33 +02:00 • committed by GitHub
commit 43fba5ea83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/std/heap.zig
View file

@ -287,7 +287,7 @@ fn rawCAlloc(
) ?[*]u8 { ) ?[*]u8 {
_ = context; _ = context;
_ = return_address; _ = return_address;
assert(alignment.compare(.lte, comptime .fromByteUnits(@alignOf(std.c.max_align_t)))); assert(alignment.compare(.lte, .of(std.c.max_align_t)));
// Note that this pointer cannot be aligncasted to max_align_t because if // Note that this pointer cannot be aligncasted to max_align_t because if
// len is < max_align_t then the alignment can be smaller. For example, if // len is < max_align_t then the alignment can be smaller. For example, if
// max_align_t is 16, but the user requests 8 bytes, there is no built-in // max_align_t is 16, but the user requests 8 bytes, there is no built-in

2
lib/std/heap/arena_allocator.zig
View file

@ -42,7 +42,7 @@ pub const ArenaAllocator = struct {
data: usize, data: usize,
node: std.SinglyLinkedList.Node = .{}, node: std.SinglyLinkedList.Node = .{},
}; };
const BufNode_alignment: Alignment = .fromByteUnits(@alignOf(BufNode)); const BufNode_alignment: Alignment = .of(BufNode);
pub fn init(child_allocator: Allocator) ArenaAllocator { pub fn init(child_allocator: Allocator) ArenaAllocator {
return (State{}).promote(child_allocator); return (State{}).promote(child_allocator);

3
lib/std/log.zig
View file

@ -101,8 +101,7 @@ pub const Level = enum {
/// The default log level is based on build mode. /// The default log level is based on build mode.
pub const default_level: Level = switch (builtin.mode) { pub const default_level: Level = switch (builtin.mode) {
.Debug => .debug, .Debug => .debug,
.ReleaseSafe => .info, .ReleaseSafe, .ReleaseFast, .ReleaseSmall => .info,
.ReleaseFast, .ReleaseSmall => .err,
}; };
const level = std.options.log_level; const level = std.options.log_level;

2
lib/std/mem/Allocator.zig
View file

@ -253,7 +253,7 @@ pub inline fn allocAdvancedWithRetAddr(
n: usize, n: usize,
return_address: usize, return_address: usize,
) Error![]align(if (alignment) |a| a.toByteUnits() else @alignOf(T)) T { ) Error![]align(if (alignment) |a| a.toByteUnits() else @alignOf(T)) T {
const a = comptime (alignment orelse Alignment.fromByteUnits(@alignOf(T))); const a = comptime (alignment orelse Alignment.of(T));
const ptr: [*]align(a.toByteUnits()) T = @ptrCast(try self.allocWithSizeAndAlignment(@sizeOf(T), a, n, return_address)); const ptr: [*]align(a.toByteUnits()) T = @ptrCast(try self.allocWithSizeAndAlignment(@sizeOf(T), a, n, return_address));
return ptr[0..n]; return ptr[0..n];
} }