Skip to content

replace optEql with std.meta.eql #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ronald-mz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replace optEql with std.meta.eql #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions src/x.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,6 @@ pub const max_display_num = max_port - TcpBasePort;
pub const BigEndian = 'B';
pub const LittleEndian = 'l';

// TODO: is there another way to do this, is this somewhere in std?
pub fn optEql(optLeft: anytype, optRight: anytype) bool {
if (optLeft) |left| {
if (optRight) |right| {
return left == right;
} else return false;
} else {
if (optRight) |_| {
return false;
} else return true;
}
}

pub const ParsedDisplay = struct {
proto: ?Protocol,
hostStart: u16,
Expand All @@ -83,7 +70,7 @@ pub const ParsedDisplay = struct {
return ptr[self.hostStart..self.hostLimit];
}
pub fn equals(self: @This(), other: @This()) bool {
return self.protoLen == other.protoLen and self.hostLimit == other.hostLimit and self.display_num == other.display_num and optEql(self.preferredScreen, other.preferredScreen);
return self.protoLen == other.protoLen and self.hostLimit == other.hostLimit and self.display_num == other.display_num and std.meta.eql(self.preferredScreen, other.preferredScreen);
}
};

Expand Down