michael/exif-rs
michael
/
exif-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Treat the built-in tag information as static data.

This commit is contained in:
KAMADA Ken'ichi 2017-05-11 23:18:33 +09:00
parent accc66f21a
commit 3736693836
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tag.rs
View File

@ -71,20 +71,20 @@ impl Tag {
/// Returns the description of the tag. /// Returns the description of the tag.
#[inline] #[inline]
pub fn description(&self) -> Option<&str> { pub fn description(&self) -> Option<&str> {
get_tag_info(self).map(|ti| ti.desc) get_tag_info(*self).map(|ti| ti.desc)
} }
/// Returns the default value of the tag. `None` is returned if /// Returns the default value of the tag. `None` is returned if
/// it is not defined in the standard or it depends on the context. /// it is not defined in the standard or it depends on the context.
#[inline] #[inline]
pub fn default_value(&self) -> Option<Value> { pub fn default_value(&self) -> Option<Value> {
get_tag_info(self).and_then(|ti| (&ti.default).into()) get_tag_info(*self).and_then(|ti| (&ti.default).into())
} }
} }
impl fmt::Display for Tag { impl fmt::Display for Tag {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match get_tag_info(self) { match get_tag_info(*self) {
Some(ti) => f.pad(ti.name), Some(ti) => f.pad(ti.name),
None => f.pad(&format!("{:?}", self)), None => f.pad(&format!("{:?}", self)),
} }
@ -153,8 +153,8 @@ macro_rules! generate_well_known_tag_constants {
)+)+ )+)+
} }
fn get_tag_info(tag: &Tag) -> Option<&tag_info::TagInfo> { fn get_tag_info(tag: Tag) -> Option<&'static tag_info::TagInfo> {
match *tag { match tag {
$($( $($(
constants::$name => Some(&tag_info::$name), constants::$name => Some(&tag_info::$name),
)+)+ )+)+