Merge remote-tracking branch 'origin/master' into stage2-whole-file-astgen

Conflicts:
 * src/codegen/spirv.zig
 * src/link/SpirV.zig

We're going to want to improve the stage2 test harness to print
the source file name when a compile error occurs otherwise std lib
contributors are going to see some confusing CI failures when they cause
stage2 AstGen compile errors.

1 files changed, 0 insertions, 14 deletions

diff --git a/lib/std/meta/trait.zig b/lib/std/meta/trait.zig
index f6327d406d..c6e5a9c512 100644
--- a/lib/std/meta/trait.zig
+++ b/lib/std/meta/trait.zig
@@ -298,20 +298,6 @@ pub fn isNumber(comptime T: type) bool {
     };
 }
 
-pub fn isIntegerNumber(comptime T: type) bool {
-    return switch (@typeInfo(T)) {
-        .Int, .ComptimeInt => true,
-        else => false,
-    };
-}
-
-pub fn isFloatingNumber(comptime T: type) bool {
-    return switch (@typeInfo(T)) {
-        .Float, .ComptimeFloat => true,
-        else => false,
-    };
-}
-
 test "std.meta.trait.isNumber" {
     const NotANumber = struct {
         number: u8,