Auto merge of #54240 - csmoe:nonzero_from, r=alexcrichton

bors · bors · commit bb0896af11bb · 2018-09-29T19:38:12.000Z
Impl From<NonZero<T>> for T Closes #54171 r? @SimonSapin
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
@@ -93,6 +93,13 @@ assert_eq!(size_of::<Option<std::num::", stringify!($Ty), ">>(), size_of::<", st
 
             }
 
+            #[stable(feature = "from_nonzero", since = "1.31.0")]
+            impl From<$Ty> for $Int {
+                fn from(nonzero: $Ty) -> Self {
+                    nonzero.0 .0
+                }
+            }
+
             impl_nonzero_fmt! {
                 (Debug, Display, Binary, Octal, LowerHex, UpperHex) for $Ty
             }
diff --git a/src/libcore/tests/nonzero.rs b/src/libcore/tests/nonzero.rs
@@ -121,3 +121,10 @@ fn test_match_nonzero_const_pattern() {
         _ => panic!("Expected the const item as a pattern to match.")
     }
 }
+
+#[test]
+fn test_from_nonzero() {
+    let nz = NonZeroU32::new(1).unwrap();
+    let num: u32 = nz.into();
+    assert_eq!(num, 1u32);
+}

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,13 @@ assert_eq!(size_of::<Option<std::num::", stringify!($Ty), ">>(), size_of::<", st`
`93`	`93`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ #[stable(feature = "from_nonzero", since = "1.31.0")]`
	`97`	`+ impl From<$Ty> for $Int {`
	`98`	`+ fn from(nonzero: $Ty) -> Self {`
	`99`	`+ nonzero.0 .0`
	`100`	`+ }`
	`101`	`+ }`
	`102`	`+`
`96`	`103`	`impl_nonzero_fmt! {`
`97`	`104`	`(Debug, Display, Binary, Octal, LowerHex, UpperHex) for $Ty`
`98`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,3 +121,10 @@ fn test_match_nonzero_const_pattern() {`
`121`	`121`	`_ => panic!("Expected the const item as a pattern to match.")`
`122`	`122`	`}`
`123`	`123`	`}`
	`124`	`+`
	`125`	`+#[test]`
	`126`	`+fn test_from_nonzero() {`
	`127`	`+ let nz = NonZeroU32::new(1).unwrap();`
	`128`	`+ let num: u32 = nz.into();`
	`129`	`+ assert_eq!(num, 1u32);`
	`130`	`+}`