user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #38861 - est31:master, r=alexcrichton

Browse source 
Make members of {std,core}::{i128,u128} unstable

Fixes #38860
This commit is contained in:
bors 2017-01-08 19:50:57 +00:00
commit bb7e7ef70e
6 changed files with 44 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcore/num/i128.rs
View file

@ -14,4 +14,4 @@
#![unstable(feature = "i128", issue="35118")]
int_module! { i128 }
int_module! { i128, #[unstable(feature = "i128", issue="35118")] }

23
src/libcore/num/int_macros.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -10,13 +10,14 @@
#![doc(hidden)]
macro_rules! int_module { ($T:ident) => (
/// The smallest value that can be represented by this integer type.
#[stable(feature = "rust1", since = "1.0.0")]
pub const MIN: $T = $T::min_value();
/// The largest value that can be represented by this integer type.
#[stable(feature = "rust1", since = "1.0.0")]
pub const MAX: $T = $T::max_value();
) }
macro_rules! int_module {
($T:ident) => (int_module!($T, #[stable(feature = "rust1", since = "1.0.0")]););
($T:ident, $($attr: tt)*) => (
/// The smallest value that can be represented by this integer type.
$($attr)*
pub const MIN: $T = $T::min_value();
/// The largest value that can be represented by this integer type.
$($attr)*
pub const MAX: $T = $T::max_value();
)
}

2
src/libcore/num/u128.rs
View file

@ -13,4 +13,4 @@
//! *[See also the `u128` primitive type](../../std/primitive.u128.html).*
#![unstable(feature = "i128", issue="35118")]
uint_module! { u128 }
uint_module! { u128, #[unstable(feature = "i128", issue="35118")] }

23
src/libcore/num/uint_macros.rs
View file

@ -1,4 +1,4 @@
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// Copyright 2012-2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -10,13 +10,14 @@
#![doc(hidden)]
macro_rules! uint_module { ($T:ident) => (
/// The smallest value that can be represented by this integer type.
#[stable(feature = "rust1", since = "1.0.0")]
pub const MIN: $T = $T::min_value();
/// The largest value that can be represented by this integer type.
#[stable(feature = "rust1", since = "1.0.0")]
pub const MAX: $T = $T::max_value();
) }
macro_rules! uint_module {
($T:ident) => (uint_module!($T, #[stable(feature = "rust1", since = "1.0.0")]););
($T:ident, $($attr: tt)*) => (
/// The smallest value that can be represented by this integer type.
$($attr)*
pub const MIN: $T = $T::min_value();
/// The largest value that can be represented by this integer type.
$($attr)*
pub const MAX: $T = $T::max_value();
)
}

1
src/librustc_const_math/lib.rs
View file

@ -26,6 +26,7 @@
#![feature(rustc_private)]
#![feature(staged_api)]
#![feature(const_fn)]
#![cfg_attr(not(stage0), feature(i128))]
#[macro_use] extern crate log;
#[macro_use] extern crate syntax;

17
src/test/compile-fail/i128-feature-libs.rs Normal file
View file

@ -0,0 +1,17 @@
// Copyright 2017 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.
fn testl() {
::std::u128::MAX; //~ ERROR use of unstable library feature 'i128'
}
fn testl2() {
::std::i128::MAX; //~ ERROR use of unstable library feature 'i128'
}