Rollup merge of rust-lang#71571 - jplatte:patch-1, r=jonas-schievink

Dylan-DPC · web-flow · commit 4a9b9765bb0b · 2020-04-26T13:42:32.000+02:00
Fix since attribute for nonzero_bitor impl's Added in rust-lang#69813, took a while to merge so the since attributes went out of date.
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
@@ -111,7 +111,7 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
                 }
             }
 
-            #[stable(feature = "nonzero_bitor", since = "1.43.0")]
+            #[stable(feature = "nonzero_bitor", since = "1.45.0")]
             impl BitOr for $Ty {
                 type Output = Self;
                 #[inline]
@@ -122,7 +122,7 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
                 }
             }
 
-            #[stable(feature = "nonzero_bitor", since = "1.43.0")]
+            #[stable(feature = "nonzero_bitor", since = "1.45.0")]
             impl BitOr<$Int> for $Ty {
                 type Output = Self;
                 #[inline]
@@ -134,7 +134,7 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
                 }
             }
 
-            #[stable(feature = "nonzero_bitor", since = "1.43.0")]
+            #[stable(feature = "nonzero_bitor", since = "1.45.0")]
             impl BitOr<$Ty> for $Int {
                 type Output = $Ty;
                 #[inline]
@@ -146,15 +146,15 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
                 }
             }
 
-            #[stable(feature = "nonzero_bitor", since = "1.43.0")]
+            #[stable(feature = "nonzero_bitor", since = "1.45.0")]
             impl BitOrAssign for $Ty {
                 #[inline]
                 fn bitor_assign(&mut self, rhs: Self) {
                     *self = *self | rhs;
                 }
             }
 
-            #[stable(feature = "nonzero_bitor", since = "1.43.0")]
+            #[stable(feature = "nonzero_bitor", since = "1.45.0")]
             impl BitOrAssign<$Int> for $Ty {
                 #[inline]
                 fn bitor_assign(&mut self, rhs: $Int) {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
`114`		`- #[stable(feature = "nonzero_bitor", since = "1.43.0")]`
	`114`	`+ #[stable(feature = "nonzero_bitor", since = "1.45.0")]`
`115`	`115`	`impl BitOr for $Ty {`
`116`	`116`	`type Output = Self;`
`117`	`117`	`#[inline]`
`@@ -122,7 +122,7 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`- #[stable(feature = "nonzero_bitor", since = "1.43.0")]`
	`125`	`+ #[stable(feature = "nonzero_bitor", since = "1.45.0")]`
`126`	`126`	`impl BitOr<$Int> for $Ty {`
`127`	`127`	`type Output = Self;`
`128`	`128`	`#[inline]`
`@@ -134,7 +134,7 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s`
`134`	`134`	`}`
`135`	`135`	`}`
`136`	`136`
`137`		`- #[stable(feature = "nonzero_bitor", since = "1.43.0")]`
	`137`	`+ #[stable(feature = "nonzero_bitor", since = "1.45.0")]`
`138`	`138`	`impl BitOr<$Ty> for $Int {`
`139`	`139`	`type Output = $Ty;`
`140`	`140`	`#[inline]`
`@@ -146,15 +146,15 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`- #[stable(feature = "nonzero_bitor", since = "1.43.0")]`
	`149`	`+ #[stable(feature = "nonzero_bitor", since = "1.45.0")]`
`150`	`150`	`impl BitOrAssign for $Ty {`
`151`	`151`	`#[inline]`
`152`	`152`	`fn bitor_assign(&mut self, rhs: Self) {`
`153`	`153`	`self = self \| rhs;`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`157`		`- #[stable(feature = "nonzero_bitor", since = "1.43.0")]`
	`157`	`+ #[stable(feature = "nonzero_bitor", since = "1.45.0")]`
`158`	`158`	`impl BitOrAssign<$Int> for $Ty {`
`159`	`159`	`#[inline]`
`160`	`160`	`fn bitor_assign(&mut self, rhs: $Int) {`