Use TryFrom since it is stable

japaric · Apr 19, 2019 · af12d60 · af12d60
1 parent 76d20ff
commit af12d60
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 202 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,4 +28,3 @@ syn = "0.12.13"
 
 [features]
 const-fn = []
-try-from = []
diff --git a/build.rs b/build.rs
@@ -134,11 +134,9 @@ fn main() {
                 cast_asserts.push(quote! {
                     assert_eq!(f64(#qx_name(#qy_name(0.5_f64).unwrap()).unwrap()), 0.5);
                 });
-                if cfg!(feature = "try-from") {
-                    try_from_asserts.push(quote! {
-                        assert_eq!(f64::from(#qx_name::try_from(#qy_name::try_from(0.5_f64).unwrap()).unwrap()), 0.5);
-                    });
-                }
+                try_from_asserts.push(quote! {
+                    assert_eq!(f64::from(#qx_name::try_from(#qy_name::try_from(0.5_f64).unwrap()).unwrap()), 0.5);
+                });
             } else {
                 cast_asserts.push(quote! {
                     assert_eq!(f64(#qx_name(#qy_name(0.5_f64).unwrap())), 0.5);
@@ -163,7 +161,6 @@ fn main() {
                 }
 
                 #[test]
-                #[cfg(feature = "try-from")]
                 fn try_from() {
                     #(#try_from_asserts)*
                 }
@@ -201,7 +198,7 @@ fn main() {
                 cast_asserts.push(quote! {
                     assert_eq!(#p_name(#q_name(#f).unwrap()).unwrap(), #i as #p_name);
                 });
-                if cfg!(feature = "try-from") && !p.is_pointer_sized() {
+                if !p.is_pointer_sized() {
                     try_from_asserts.push(quote! {
                         assert_eq!(#p_name::try_from(#q_name::try_from(#f).unwrap()).unwrap(), #i as #p_name);
                     });
@@ -232,7 +229,6 @@ fn main() {
                 }
 
                 #[test]
-                #[cfg(feature = "try-from")]
                 fn try_from() {
                     #(#try_from_asserts)*
                 }
@@ -275,7 +271,7 @@ fn main() {
                 cast_asserts.push(quote! {
                     assert_eq!(f64(#q_name(#i as #p_name).unwrap()), #i as f64);
                 });
-                if cfg!(feature = "try-from") && !p.is_pointer_sized() {
+                if !p.is_pointer_sized() {
                     try_from_asserts.push(quote! {
                         assert_eq!(f64::from(#q_name::try_from(#i as #p_name).unwrap()), #i as f64);
                     });
@@ -297,7 +293,6 @@ fn main() {
                 }
 
                 #[test]
-                #[cfg(feature = "try-from")]
                 fn try_from() {
                     #(#try_from_asserts)*
                 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@ syn = "0.12.13"

		[features]
		const-fn = []
		try-from = []