calc-math update

src/main.rs

@@ -480,20 +480,21 @@ impl NumberInput {
     }
 
     fn to_decimal(&self) -> Decimal<5, u8> {
-        Decimal {
+        Decimal::new(
-            minus: self.minus,
+            self.minus,
-            significant: self.significant,
+            self.significant,
-            minus_exponent: self.minus_exponent,
+            self.minus_exponent,
-            exponent: self.exponent[0] * 10 + self.exponent[1],
+            self.exponent[0] * 10 + self.exponent[1],
-        }
+        )
     }
 
     fn set_decimal(&mut self, dec: Decimal<5, u8>) {
-        self.minus = dec.minus;
+        let (minus, significant, minus_exponent, exponent) = dec.into_parts();
-        self.significant = dec.significant;
+        self.minus = minus;
-        self.minus_exponent = dec.minus_exponent;
+        self.significant = significant;
-        self.exponent[0] = dec.exponent / 10;
+        self.minus_exponent = minus_exponent;
-        self.exponent[1] = dec.exponent - dec.exponent / 10;
+        self.exponent[0] = exponent / 10;
+        self.exponent[1] = exponent - exponent / 10;
     }
 }
 
@@ -576,7 +577,7 @@ fn main() -> ! {
     let mut display = DispalyState::default();
     number_input.show(&mut display);
 
-    let mut calc = StackCalc::<2, 5, u8>::default();
+    let mut calc = StackCalc::<f32, 2, 5, u8>::default();
     let mut state = State::EnterSignificant;
 
     loop {