squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #65045 - Centril:rollup-djvi539, r=Centril

Browse source 
Rollup of 2 pull requests

Successful merges:

 - #64941 (Inline `{min,max}_value` even in debug builds)
 - #65002 (Update llvm-project submodule)

Failed merges:

r? @ghost
This commit is contained in:
bors 2019-10-03 06:05:08 +00:00
commit 0221e26562
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libcore/num/mod.rs
View file

@ -252,7 +252,7 @@ Basic usage:
$EndFeature, "
```"),
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
#[inline(always)]
#[rustc_promotable]
pub const fn min_value() -> Self {
!0 ^ ((!0 as $UnsignedT) >> 1) as Self
@ -271,7 +271,7 @@ Basic usage:
$EndFeature, "
```"),
#[stable(feature = "rust1", since = "1.0.0")]
#[inline]
#[inline(always)]
#[rustc_promotable]
pub const fn max_value() -> Self {
!Self::min_value()
@ -2311,7 +2311,7 @@ Basic usage:
```"),
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_promotable]
#[inline]
#[inline(always)]
pub const fn min_value() -> Self { 0 }
}
@ -2328,7 +2328,7 @@ stringify!($MaxV), ");", $EndFeature, "
```"),
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_promotable]
#[inline]
#[inline(always)]
pub const fn max_value() -> Self { !0 }
}

2
src/llvm-project

@ -1 +1 @@
Subproject commit 8adf9bdccfefb8d03f0e8db3b012fb41da1580a4
Subproject commit 8473db5f2af9dc36aaf6f9b053fcc2e0e6ac8026