Merge remote-tracking branch 'origin/master' into llvm14

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/std/io/fixed_buffer_stream.zig b/lib/std/io/fixed_buffer_stream.zig
index 3623ef1989..b002bb47b8 100644
--- a/lib/std/io/fixed_buffer_stream.zig
+++ b/lib/std/io/fixed_buffer_stream.zig
@@ -76,20 +76,20 @@ pub fn FixedBufferStream(comptime Buffer: type) type {
         }
 
         pub fn seekTo(self: *Self, pos: u64) SeekError!void {
-            self.pos = if (std.math.cast(usize, pos)) |x| std.math.min(self.buffer.len, x) else |_| self.buffer.len;
+            self.pos = if (std.math.cast(usize, pos)) |x| std.math.min(self.buffer.len, x) else self.buffer.len;
         }
 
         pub fn seekBy(self: *Self, amt: i64) SeekError!void {
             if (amt < 0) {
                 const abs_amt = std.math.absCast(amt);
-                const abs_amt_usize = std.math.cast(usize, abs_amt) catch std.math.maxInt(usize);
+                const abs_amt_usize = std.math.cast(usize, abs_amt) orelse std.math.maxInt(usize);
                 if (abs_amt_usize > self.pos) {
                     self.pos = 0;
                 } else {
                     self.pos -= abs_amt_usize;
                 }
             } else {
-                const amt_usize = std.math.cast(usize, amt) catch std.math.maxInt(usize);
+                const amt_usize = std.math.cast(usize, amt) orelse std.math.maxInt(usize);
                 const new_pos = std.math.add(usize, self.pos, amt_usize) catch std.math.maxInt(usize);
                 self.pos = std.math.min(self.buffer.len, new_pos);
             }
@@ -120,7 +120,7 @@ pub fn fixedBufferStream(buffer: anytype) FixedBufferStream(NonSentinelSpan(@Typ
 fn NonSentinelSpan(comptime T: type) type {
     var ptr_info = @typeInfo(mem.Span(T)).Pointer;
     ptr_info.sentinel = null;
-    return @Type(std.builtin.TypeInfo{ .Pointer = ptr_info });
+    return @Type(.{ .Pointer = ptr_info });
 }
 
 test "FixedBufferStream output" {