diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-12-10 06:14:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-10 06:14:57 -0500 |
| commit | 7637ac584fc2cee95dc5a20f51844b72fc7ecc82 (patch) | |
| tree | 92d425bd0fccd34472453fa38c0cd721612023ea /lib | |
| parent | e4874d842ec3a771a5c438b4c48020a74c221935 (diff) | |
| parent | 89d1ccc477c1dbc8bb8d13ad2598ef0190c25898 (diff) | |
| download | zig-7637ac584fc2cee95dc5a20f51844b72fc7ecc82.tar.gz zig-7637ac584fc2cee95dc5a20f51844b72fc7ecc82.zip | |
Merge pull request #13821 from Vexu/eliminate-bound-fn
Eliminate `BoundFn` type from the language
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/std/builtin.zig | 1 | ||||
| -rw-r--r-- | lib/std/hash/auto_hash.zig | 2 | ||||
| -rw-r--r-- | lib/std/mem.zig | 1 | ||||
| -rw-r--r-- | lib/std/meta/trait.zig | 1 | ||||
| -rw-r--r-- | lib/std/testing.zig | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index fac5819b38..4ee9d4306b 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -210,7 +210,6 @@ pub const Type = union(enum) { Enum: Enum, Union: Union, Fn: Fn, - BoundFn: Fn, Opaque: Opaque, Frame: Frame, AnyFrame: AnyFrame, diff --git a/lib/std/hash/auto_hash.zig b/lib/std/hash/auto_hash.zig index 56cb4c726c..76cbab8698 100644 --- a/lib/std/hash/auto_hash.zig +++ b/lib/std/hash/auto_hash.zig @@ -101,7 +101,7 @@ pub fn hash(hasher: anytype, key: anytype, comptime strat: HashStrategy) void { .Bool => hash(hasher, @boolToInt(key), strat), .Enum => hash(hasher, @enumToInt(key), strat), .ErrorSet => hash(hasher, @errorToInt(key), strat), - .AnyFrame, .BoundFn, .Fn => hash(hasher, @ptrToInt(key), strat), + .AnyFrame, .Fn => hash(hasher, @ptrToInt(key), strat), .Pointer => @call(.{ .modifier = .always_inline }, hashPointer, .{ hasher, key, strat }), diff --git a/lib/std/mem.zig b/lib/std/mem.zig index c0385f6e98..a020c9b7e0 100644 --- a/lib/std/mem.zig +++ b/lib/std/mem.zig @@ -308,7 +308,6 @@ pub fn zeroes(comptime T: type) T { .ErrorUnion, .ErrorSet, .Fn, - .BoundFn, .Type, .NoReturn, .Undefined, diff --git a/lib/std/meta/trait.zig b/lib/std/meta/trait.zig index 51cc3638fb..2e9c2165f7 100644 --- a/lib/std/meta/trait.zig +++ b/lib/std/meta/trait.zig @@ -549,7 +549,6 @@ pub fn hasUniqueRepresentation(comptime T: type) bool { else => return false, // TODO can we know if it's true for some of these types ? .AnyFrame, - .BoundFn, .Enum, .ErrorSet, .Fn, diff --git a/lib/std/testing.zig b/lib/std/testing.zig index 6882a19f1d..3bb3d6e14b 100644 --- a/lib/std/testing.zig +++ b/lib/std/testing.zig @@ -46,7 +46,6 @@ pub fn expectError(expected_error: anyerror, actual_error_union: anytype) !void pub fn expectEqual(expected: anytype, actual: @TypeOf(expected)) !void { switch (@typeInfo(@TypeOf(actual))) { .NoReturn, - .BoundFn, .Opaque, .Frame, .AnyFrame, |
