From f856b124fd0d98ddf81ae6feb9bbed25da072bd1 Mon Sep 17 00:00:00 2001
From: Mark McCaskey <MarkMcCaskey@users.noreply.github.com>
Date: Fri, 12 Jul 2019 02:21:00 -0700
Subject: [PATCH] Use Default trait for Position and DisplayFunctionAnnotations
 (#843)

---
 cranelift/codegen/src/ir/function.rs | 11 +----------
 cranelift/frontend/src/frontend.rs   |  8 +-------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/cranelift/codegen/src/ir/function.rs b/cranelift/codegen/src/ir/function.rs
index f4b62dc59c..c856f70e54 100644
--- a/cranelift/codegen/src/ir/function.rs
+++ b/cranelift/codegen/src/ir/function.rs
@@ -222,6 +222,7 @@ impl Function {
 }
 
 /// Additional annotations for function display.
+#[derive(Default)]
 pub struct DisplayFunctionAnnotations<'a> {
     /// Enable ISA annotations.
     pub isa: Option<&'a dyn TargetIsa>,
@@ -230,16 +231,6 @@ pub struct DisplayFunctionAnnotations<'a> {
     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> {
     fn from(isa: Option<&'a dyn TargetIsa>) -> DisplayFunctionAnnotations {
         DisplayFunctionAnnotations {
diff --git a/cranelift/frontend/src/frontend.rs b/cranelift/frontend/src/frontend.rs
index 82a3a09f1a..355b460067 100644
--- a/cranelift/frontend/src/frontend.rs
+++ b/cranelift/frontend/src/frontend.rs
@@ -46,6 +46,7 @@ struct EbbData {
     user_param_count: usize,
 }
 
+#[derive(Default)]
 struct Position {
     ebb: PackedOption<Ebb>,
     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 {
         self.ebb.is_none() && self.basic_block.is_none()
     }