Skip to content

Make members of {std,core}::{i128,u128} unstable #38861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libcore/num/i128.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@

#![unstable(feature = "i128", issue="35118")]

int_module! { i128 }
int_module! { i128, #[unstable(feature = "i128", issue="35118")] }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The feature name was defined to be i128_type here
https://github.com/rust-lang/rust/blob/master/src/libsyntax/feature_gate.rs#L323
Should this match that definition?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are two different features. One (i128_type) gates the actual type in the language, the other (i128) gates the library members. Here we use the library gating one.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation!

23 changes: 12 additions & 11 deletions src/libcore/num/int_macros.rs
Original file line number Diff line number Diff line change
@@ -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.
//
Expand All @@ -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 changes: 1 addition & 1 deletion src/libcore/num/u128.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 12 additions & 11 deletions src/libcore/num/uint_macros.rs
Original file line number Diff line number Diff line change
@@ -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.
//
Expand All @@ -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 change: 1 addition & 0 deletions src/librustc_const_math/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
17 changes: 17 additions & 0 deletions src/test/compile-fail/i128-feature-libs.rs
Original file line number Diff line number Diff line change
@@ -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'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error should be u128, no?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the feature is named i128, there is one for both i128 and u128.

}

fn testl2() {
::std::i128::MAX; //~ ERROR use of unstable library feature 'i128'
}