diff options
| author | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-26 15:48:58 +0000 |
| commit | 7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f (patch) | |
| tree | 473644e3095ec29d92b0c68880f49599c402cbfa /src/libcore | |
| parent | ec1f28f9614292c36b371d3758afffdd52cb9786 (diff) | |
| parent | aa9dc6952235a58d4c37b63bed15992f5225fbf0 (diff) | |
| download | rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.tar.gz rust-7f3b3df9e2f2efe3434b4f6fc76462d2c8ad332f.zip | |
Auto merge of #71579 - Dylan-DPC:rollup-h9om2g3, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71490 (Cleanup and document `-C relocation-model`) - #71562 (fix more clippy warnings) - #71571 (Fix since attribute for nonzero_bitor impl's) - #71574 (proc_macro: Fix since attributes for new Span methods) - #71575 (Fix stable(since) attribute for BTreeMap::remove_entry) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/num/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 0349678b07b..a259e293b0c 100644 --- 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,7 +146,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 BitOrAssign for $Ty { #[inline] fn bitor_assign(&mut self, rhs: Self) { @@ -154,7 +154,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 BitOrAssign<$Int> for $Ty { #[inline] fn bitor_assign(&mut self, rhs: $Int) { |