Skip to content
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

Simplify type bounds on Setting, not always Eq #77

Merged
merged 1 commit into from
Dec 7, 2024
Merged

Simplify type bounds on Setting, not always Eq #77

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
18 changes: 5 additions & 13 deletions src/setting.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,15 @@ use super::{tag_from_bytes, tag_from_str_lossy, Tag};
use core::fmt;

/// Setting combining a tag and a value for features and variations.
#[derive(Copy, Clone, Default, Debug)]
pub struct Setting<T: Copy> {
#[derive(Copy, Clone, Default, Debug, PartialEq, Eq)]
pub struct Setting<T> {
/// The tag that identifies the setting.
pub tag: Tag,
/// The value for the setting.
pub value: T,
}

impl<T: Copy + PartialEq> PartialEq for Setting<T> {
fn eq(&self, other: &Self) -> bool {
self.tag == other.tag && self.value == other.value
}
}

impl<T: Copy + PartialEq> Eq for Setting<T> {}

impl<T: Copy + fmt::Display> fmt::Display for Setting<T> {
impl<T: fmt::Display> fmt::Display for Setting<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let bytes = self.tag.to_be_bytes();
let tag_name = core::str::from_utf8(&bytes).unwrap_or("");
Expand Down Expand Up @@ -74,7 +66,7 @@ impl Setting<f32> {
}
}

impl<T: Copy> From<(Tag, T)> for Setting<T> {
impl<T> From<(Tag, T)> for Setting<T> {
fn from(v: (Tag, T)) -> Self {
Self {
tag: v.0,
Expand Down Expand Up @@ -110,7 +102,7 @@ impl<T: Copy> From<&(&[u8; 4], T)> for Setting<T> {
}
}

impl<T: Copy> From<(&str, T)> for Setting<T> {
impl<T> From<(&str, T)> for Setting<T> {
fn from(v: (&str, T)) -> Self {
Self {
tag: tag_from_str_lossy(v.0),
Expand Down
Loading