Use Default trait for Position and DisplayFunctionAnnotations (#843)

This commit is contained in:
Mark McCaskey
2019-07-12 02:21:00 -07:00
committed by Benjamin Bouvier
parent 6a19866da2
commit f856b124fd
2 changed files with 2 additions and 17 deletions

View File

@@ -222,6 +222,7 @@ impl Function {
} }
/// Additional annotations for function display. /// Additional annotations for function display.
#[derive(Default)]
pub struct DisplayFunctionAnnotations<'a> { pub struct DisplayFunctionAnnotations<'a> {
/// Enable ISA annotations. /// Enable ISA annotations.
pub isa: Option<&'a dyn TargetIsa>, pub isa: Option<&'a dyn TargetIsa>,
@@ -230,16 +231,6 @@ pub struct DisplayFunctionAnnotations<'a> {
pub value_ranges: Option<&'a ValueLabelsRanges>, pub value_ranges: Option<&'a ValueLabelsRanges>,
} }
impl<'a> DisplayFunctionAnnotations<'a> {
/// Create a DisplayFunctionAnnotations with all fields set to None.
pub fn default() -> Self {
DisplayFunctionAnnotations {
isa: None,
value_ranges: None,
}
}
}
impl<'a> From<Option<&'a dyn TargetIsa>> for DisplayFunctionAnnotations<'a> { impl<'a> From<Option<&'a dyn TargetIsa>> for DisplayFunctionAnnotations<'a> {
fn from(isa: Option<&'a dyn TargetIsa>) -> DisplayFunctionAnnotations { fn from(isa: Option<&'a dyn TargetIsa>) -> DisplayFunctionAnnotations {
DisplayFunctionAnnotations { DisplayFunctionAnnotations {

View File

@@ -46,6 +46,7 @@ struct EbbData {
user_param_count: usize, user_param_count: usize,
} }
#[derive(Default)]
struct Position { struct Position {
ebb: PackedOption<Ebb>, ebb: PackedOption<Ebb>,
basic_block: PackedOption<Block>, basic_block: PackedOption<Block>,
@@ -59,13 +60,6 @@ impl Position {
} }
} }
fn default() -> Self {
Self {
ebb: PackedOption::default(),
basic_block: PackedOption::default(),
}
}
fn is_default(&self) -> bool { fn is_default(&self) -> bool {
self.ebb.is_none() && self.basic_block.is_none() self.ebb.is_none() && self.basic_block.is_none()
} }