@@ -161,15 +161,15 @@ impl<T: Float + fmt::Display> fmt::Display for OrderedFloat<T> {
161161 }
162162}
163163
164- impl Into < f32 > for OrderedFloat < f32 > {
165- fn into ( self ) -> f32 {
166- self . into_inner ( )
164+ impl From < OrderedFloat < f32 > > for f32 {
165+ fn from ( f : OrderedFloat < f32 > ) -> f32 {
166+ f . 0
167167 }
168168}
169169
170- impl Into < f64 > for OrderedFloat < f64 > {
171- fn into ( self ) -> f64 {
172- self . into_inner ( )
170+ impl From < OrderedFloat < f64 > > for f64 {
171+ fn from ( f : OrderedFloat < f64 > ) -> f64 {
172+ f . 0
173173 }
174174}
175175
@@ -519,32 +519,32 @@ impl<T: Float + Num> Num for OrderedFloat<T> {
519519#[ repr( transparent) ]
520520pub struct NotNan < T > ( T ) ;
521521
522- impl < T > NotNan < T > {
523- /// Create a NotNan value from a value that is guaranteed to not be NaN
524- ///
525- /// # Safety
526- ///
527- /// Behaviour is undefined if `val` is NaN
528- pub const unsafe fn unchecked_new ( val : T ) -> Self {
529- NotNan ( val)
530- }
531- }
532-
533522impl < T : Float > NotNan < T > {
534- /// Create a NotNan value.
523+ /// Create a ` NotNan` value.
535524 ///
536- /// Returns Err if val is NaN
525+ /// Returns ` Err` if ` val` is NaN
537526 pub fn new ( val : T ) -> Result < Self , FloatIsNan > {
538527 match val {
539528 ref val if val. is_nan ( ) => Err ( FloatIsNan ) ,
540529 val => Ok ( NotNan ( val) ) ,
541530 }
542531 }
532+ }
543533
534+ impl < T > NotNan < T > {
544535 /// Get the value out.
545536 pub fn into_inner ( self ) -> T {
546537 self . 0
547538 }
539+
540+ /// Create a `NotNan` value from a value that is guaranteed to not be NaN
541+ ///
542+ /// # Safety
543+ ///
544+ /// Behaviour is undefined if `val` is NaN
545+ pub const unsafe fn unchecked_new ( val : T ) -> Self {
546+ NotNan ( val)
547+ }
548548}
549549
550550impl < T : Float > AsRef < T > for NotNan < T > {
@@ -831,9 +831,9 @@ impl fmt::Display for FloatIsNan {
831831}
832832
833833#[ cfg( feature = "std" ) ]
834- impl Into < std:: io:: Error > for FloatIsNan {
835- fn into ( self ) -> std:: io:: Error {
836- std:: io:: Error :: new ( std:: io:: ErrorKind :: InvalidInput , self )
834+ impl From < FloatIsNan > for std:: io:: Error {
835+ fn from ( e : FloatIsNan ) -> std:: io:: Error {
836+ std:: io:: Error :: new ( std:: io:: ErrorKind :: InvalidInput , e )
837837 }
838838}
839839
0 commit comments