Skip to content

Commit

Permalink
Add missing rustc_promotable attribute to unsigned min_value and …
Browse files Browse the repository at this point in the history
…`max_value`
  • Loading branch information
oli-obk committed Nov 9, 2018
1 parent 36a50c2 commit f4c9dd5
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/libcore/num/mod.rs
Expand Up @@ -2152,6 +2152,7 @@ Basic usage:
", $Feature, "assert_eq!(", stringify!($SelfT), "::min_value(), 0);", $EndFeature, "
```"),
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_promotable]
#[inline]
pub const fn min_value() -> Self { 0 }
}
Expand All @@ -2168,6 +2169,7 @@ Basic usage:
stringify!($MaxV), ");", $EndFeature, "
```"),
#[stable(feature = "rust1", since = "1.0.0")]
#[rustc_promotable]
#[inline]
pub const fn max_value() -> Self { !0 }
}
Expand Down
31 changes: 31 additions & 0 deletions src/test/ui/consts/auxiliary/promotable_const_fn_lib.rs
@@ -0,0 +1,31 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// Crate that exports a const fn. Used for testing cross-crate.

#![feature(staged_api, rustc_attrs)]
#![stable(since="1.0.0", feature = "mep")]

#![crate_type="rlib"]

#[rustc_promotable]
#[stable(since="1.0.0", feature = "mep")]
#[inline]
pub const fn foo() -> usize { 22 }

#[stable(since="1.0.0", feature = "mep")]
pub struct Foo(usize);

impl Foo {
#[stable(since="1.0.0", feature = "mep")]
#[inline]
#[rustc_promotable]
pub const fn foo() -> usize { 22 }
}
13 changes: 13 additions & 0 deletions src/test/ui/consts/promote_fn_calls.rs
@@ -0,0 +1,13 @@
// compile-pass
// aux-build:promotable_const_fn_lib.rs

#![feature(nll)]

extern crate promotable_const_fn_lib;

use promotable_const_fn_lib::{foo, Foo};

fn main() {
let x: &'static usize = &foo();
let x: &'static usize = &Foo::foo();
}
30 changes: 30 additions & 0 deletions src/test/ui/consts/promote_fn_calls_std.rs
@@ -0,0 +1,30 @@
// compile-pass

#![feature(nll)]

fn main() {
let x: &'static u8 = &u8::max_value();
let x: &'static u16 = &u16::max_value();
let x: &'static u32 = &u32::max_value();
let x: &'static u64 = &u64::max_value();
let x: &'static u128 = &u128::max_value();
let x: &'static usize = &usize::max_value();
let x: &'static u8 = &u8::min_value();
let x: &'static u16 = &u16::min_value();
let x: &'static u32 = &u32::min_value();
let x: &'static u64 = &u64::min_value();
let x: &'static u128 = &u128::min_value();
let x: &'static usize = &usize::min_value();
let x: &'static i8 = &i8::max_value();
let x: &'static i16 = &i16::max_value();
let x: &'static i32 = &i32::max_value();
let x: &'static i64 = &i64::max_value();
let x: &'static i128 = &i128::max_value();
let x: &'static isize = &isize::max_value();
let x: &'static i8 = &i8::min_value();
let x: &'static i16 = &i16::min_value();
let x: &'static i32 = &i32::min_value();
let x: &'static i64 = &i64::min_value();
let x: &'static i128 = &i128::min_value();
let x: &'static isize = &isize::min_value();
}

0 comments on commit f4c9dd5

Please sign in to comment.