Skip to content

Implemented the Display trait for enums to enable to_string usage #110

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

Merged
ndesh26 merged 4 commits into from
Jan 19, 2025
Merged

Implemented the Display trait for enums to enable to_string usage #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10c26b3
Implemented the Display trait for enums to enable to_string
kimimaru4000 Jan 9, 2025
e2ebe9a
Added new line and fixed last implementation being invalid
kimimaru4000 Jan 9, 2025
aa88ec6
Removed error
kimimaru4000 Jan 9, 2025
1987d8f
Simplified Display and blacklisted enums with existing implementations
kimimaru4000 Jan 9, 2025
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
66 changes: 66 additions & 0 deletions src/enums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ impl std::str::FromStr for EV_REL {
}
}

impl std::fmt::Display for EV_REL {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -301,6 +307,12 @@ impl std::str::FromStr for EV_ABS {
}
}

impl std::fmt::Display for EV_ABS {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2164,6 +2176,12 @@ impl std::str::FromStr for EV_KEY {
}
}

impl std::fmt::Display for EV_KEY {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2221,6 +2239,12 @@ impl std::str::FromStr for EV_LED {
}
}

impl std::fmt::Display for EV_LED {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2254,6 +2278,12 @@ impl std::str::FromStr for EV_SND {
}
}

impl std::fmt::Display for EV_SND {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2296,6 +2326,12 @@ impl std::str::FromStr for EV_MSC {
}
}

impl std::fmt::Display for EV_MSC {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2372,6 +2408,12 @@ impl std::str::FromStr for EV_SW {
}
}

impl std::fmt::Display for EV_SW {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2408,6 +2450,12 @@ impl std::str::FromStr for EV_SYN {
}
}

impl std::fmt::Display for EV_SYN {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2439,6 +2487,12 @@ impl std::str::FromStr for EV_REP {
}
}

impl std::fmt::Display for EV_REP {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2566,6 +2620,12 @@ impl std::str::FromStr for EV_FF {
}
}

impl std::fmt::Display for EV_FF {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}

#[allow(non_camel_case_types)]
#[cfg_attr(feature = "serde", derive(Serialize), derive(Deserialize))]
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
Expand Down Expand Up @@ -2655,3 +2715,9 @@ impl std::str::FromStr for BusType {
}
}
}

impl std::fmt::Display for BusType {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
write!(f, "{:?}", self)
}
}
67 changes: 45 additions & 22 deletions tools/make-event-names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ class Bits(object):
"SYN_",
"REP_",
"INPUT_PROP_",
"BUS_"
"BUS_",
]

prefix_additional = {
"key": ["btn"]
}
prefix_additional = {"key": ["btn"]}

blacklist = [
"EV_VERSION",
Expand Down Expand Up @@ -67,10 +65,15 @@ class Bits(object):
"REP_",
]

fmt_blacklist = [
"EventType",
"InputProp",
]


def convert(name):
s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name)
return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower()


def get_enum_name(prefix):
Expand All @@ -85,7 +88,6 @@ def get_enum_name(prefix):


def print_enums(bits, prefix):

if not hasattr(bits, prefix):
return

Expand Down Expand Up @@ -115,8 +117,10 @@ def print_enums(bits, prefix):
print("impl %s {" % enum_name)
for orig, names in associated_names:
for name in names:
print(" pub const %s: %s = %s::%s;" %
(name, enum_name, enum_name, orig))
print(
" pub const %s: %s = %s::%s;"
% (name, enum_name, enum_name, orig)
)
print("}")
print("")

Expand All @@ -134,8 +138,10 @@ def print_enums_convert_fn(bits, prefix):
if not hasattr(bits, prefix):
return

print("pub const fn %s(code: u32) -> Option<%s> {" %
("int_to_" + convert(fn_name), fn_name))
print(
"pub const fn %s(code: u32) -> Option<%s> {"
% ("int_to_" + convert(fn_name), fn_name)
)
print(" match code {")
for val, names in list(getattr(bits, prefix).items()):
# Note(ndesh): We use EV_MAX as proxy to write the UNKnown event
Expand All @@ -152,26 +158,42 @@ def print_enums_convert_fn(bits, prefix):


def print_enums_fromstr(bits, prefix):

if not hasattr(bits, prefix):
return

enum_name = get_enum_name(prefix)

print('impl std::str::FromStr for %s {' % enum_name)
print(' type Err = ();')
print(' fn from_str(s: &str) -> Result<Self, Self::Err> {')
print(' match s {')
print("impl std::str::FromStr for %s {" % enum_name)
print(" type Err = ();")
print(" fn from_str(s: &str) -> Result<Self, Self::Err> {")
print(" match s {")

for p in (prefix, *prefix_additional.get(prefix, ())):
for _val, names in list(getattr(bits, p).items()):
name = names[0]
print(' "%s" => Ok(%s::%s),' % (name, enum_name, name))
print(' _ => Err(()),')
print(' }')
print(' }')
print('}')
print('')
print(" _ => Err(()),")
print(" }")
print(" }")
print("}")
print("")


def print_enums_fmt(bits, prefix):
if not hasattr(bits, prefix):
return

enum_name = get_enum_name(prefix)

if enum_name in fmt_blacklist:
return

print("impl std::fmt::Display for %s {" % enum_name)
print(" fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {")
print(' write!(f, "{:?}", self)')
print(" }")
print("}")
print("")


def print_event_code(bits, prefix):
Expand All @@ -183,7 +205,7 @@ def print_event_code(bits, prefix):
print("#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]")
print("pub enum EventCode {")
for val, [name] in list(getattr(bits, prefix).items()):
if name[3:]+"_" in event_names:
if name[3:] + "_" in event_names:
print(" %s(%s)," % (name, name))
elif name == "EV_FF_STATUS":
print(" EV_FF_STATUS(EV_FF),")
Expand All @@ -207,6 +229,7 @@ def print_mapping_table(bits):
print_enums(bits, prefix[:-1].lower())
print_enums_convert_fn(bits, prefix[:-1].lower())
print_enums_fromstr(bits, prefix[:-1].lower())
print_enums_fmt(bits, prefix[:-1].lower())
if prefix == "EV_":
print_event_code(bits, prefix[:-1].lower())

Expand Down
Loading