Merge branch 'master' into err-ret-trace-improvements-1923

ziglang · Oct 19, 2022 · 60db2f9 · 60db2f9
2 parents fd365e7 + 1952dd6
commit 60db2f9
Show file tree

Hide file tree

Showing 62 changed files with 674 additions and 685 deletions.
diff --git a/ci/azure/pipelines.yml b/ci/azure/pipelines.yml
@@ -16,7 +16,7 @@ jobs:
     vmImage: 'windows-2019'
   variables:
     TARGET: 'x86_64-windows-gnu'
-    ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.4300+1f196b9e2'
+    ZIG_LLVM_CLANG_LLD_NAME: 'zig+llvm+lld+clang-${{ variables.TARGET }}-0.10.0-dev.4459+4f9345d20'
     ZIG_LLVM_CLANG_LLD_URL: 'https://ziglang.org/deps/${{ variables.ZIG_LLVM_CLANG_LLD_NAME }}.zip'
   steps:
   - pwsh: |

diff --git a/doc/langref.html.in b/doc/langref.html.in
@@ -8977,15 +8977,15 @@ test "integer cast panic" {
       </p>
       {#header_close#}
 
-      {#header_open|@maximum#}
-      <pre>{#syntax#}@maximum(a: T, b: T) T{#endsyntax#}</pre>
+      {#header_open|@max#}
+      <pre>{#syntax#}@max(a: T, b: T) T{#endsyntax#}</pre>
       <p>
       Returns the maximum value of {#syntax#}a{#endsyntax#} and {#syntax#}b{#endsyntax#}. This builtin accepts integers, floats, and vectors of either. In the latter case, the operation is performed element wise.
       </p>
       <p>
       NaNs are handled as follows: if one of the operands of a (pairwise) operation is NaN, the other operand is returned. If both operands are NaN, NaN is returned.
       </p>
-      {#see_also|@minimum|Vectors#}
+      {#see_also|@min|Vectors#}
       {#header_close#}
 
       {#header_open|@memcpy#}
@@ -9025,15 +9025,15 @@ mem.copy(u8, dest[0..byte_count], source[0..byte_count]);{#endsyntax#}</pre>
 mem.set(u8, dest, c);{#endsyntax#}</pre>
       {#header_close#}
 
-      {#header_open|@minimum#}
-      <pre>{#syntax#}@minimum(a: T, b: T) T{#endsyntax#}</pre>
+      {#header_open|@min#}
+      <pre>{#syntax#}@min(a: T, b: T) T{#endsyntax#}</pre>
       <p>
       Returns the minimum value of {#syntax#}a{#endsyntax#} and {#syntax#}b{#endsyntax#}. This builtin accepts integers, floats, and vectors of either. In the latter case, the operation is performed element wise.
       </p>
       <p>
       NaNs are handled as follows: if one of the operands of a (pairwise) operation is NaN, the other operand is returned. If both operands are NaN, NaN is returned.
       </p>
-      {#see_also|@maximum|Vectors#}
+      {#see_also|@max|Vectors#}
       {#header_close#}
 
       {#header_open|@wasmMemorySize#}

diff --git a/lib/compiler_rt/float_to_int.zig b/lib/compiler_rt/float_to_int.zig
@@ -29,9 +29,9 @@ pub inline fn floatToInt(comptime I: type, a: anytype) I {
     switch (@typeInfo(I).Int.signedness) {
         .unsigned => {
             if (negative) return 0;
-            if (@intCast(c_uint, exponent) >= @minimum(int_bits, max_exp)) return math.maxInt(I);
+            if (@intCast(c_uint, exponent) >= @min(int_bits, max_exp)) return math.maxInt(I);
         },
-        .signed => if (@intCast(c_uint, exponent) >= @minimum(int_bits - 1, max_exp)) {
+        .signed => if (@intCast(c_uint, exponent) >= @min(int_bits - 1, max_exp)) {
             return if (negative) math.minInt(I) else math.maxInt(I);
         },
     }