Browse Source

Sort and clean uses

master
Georg Hopp 6 years ago
parent
commit
c597617898
Signed by: ghopp GPG Key ID: 4C5D226768784538
  1. 6
      fractional/src/fractional.rs
  2. 12
      fractional/src/vector.rs

6
fractional/src/fractional.rs

@ -24,7 +24,7 @@
//
use std::cmp::Ordering;
use std::convert::{TryFrom, TryInto};
use std::fmt;
use std::fmt::{Formatter, Display};
use std::num::TryFromIntError;
use std::ops::{Add,Sub,Neg,Mul,Div};
@ -116,8 +116,8 @@ impl TryInto<(i32, i32)> for Fractional {
}
}
impl fmt::Display for Fractional {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
impl Display for Fractional {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
write!(f, "({}/{})", self.0, self.1)
}
}

12
fractional/src/vector.rs

@ -18,8 +18,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
use std::fmt::{Formatter, Display, Result};
use std::ops::{Add, Sub, Neg, Mul, Div};
use std::fmt;
use crate::trigonometry::Trig;
#[derive(Debug, Eq, Clone, Copy)]
@ -61,10 +62,11 @@ where T: Add<Output = T> + Sub<Output = T> + Neg<Output = T>
}
}
impl<T> fmt::Display for Vector<T>
where T: Add + Sub + Neg + Mul + Div + Trig + fmt::Display + Copy {
fn fmt(&self, f :&mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "({}, {}, {})", self.0, self.1, self.2)
impl<T> Display for Vector<T>
where T: Add + Sub + Neg + Mul + Div + Trig + Display + Copy {
fn fmt(&self, f :&mut Formatter<'_>) -> Result {
let Vector(x, y, z) = self;
write!(f, "({}, {}, {})", x, y, z)
}
}

Loading…
Cancel
Save