Skip to content

Commit

Permalink
Auto merge of #65045 - Centril:rollup-djvi539, r=Centril
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Oct 3, 2019
2 parents c6293e3 + 64ac499 commit 0221e26
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/libcore/num/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down Expand Up @@ -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 }
}

Expand All @@ -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 }
}

Expand Down

0 comments on commit 0221e26

Please sign in to comment.