From: Alex Crichton <alex@alexcrichton.com>
Date: Tue, 31 Mar 2015 17:15:26 +0000 (-0700)
Subject: rollup merge of #23549: aturon/stab-num
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=5d0beb7d85e8e711334c7fb6f2c5da270e5200cb;p=rust.git

rollup merge of #23549: aturon/stab-num

This commit stabilizes the `std::num` module:

* The `Int` and `Float` traits are deprecated in favor of (1) the
  newly-added inherent methods and (2) the generic traits available in
  rust-lang/num.

* The `Zero` and `One` traits are reintroduced in `std::num`, which
  together with various other traits allow you to recover the most
  common forms of generic programming.

* The `FromStrRadix` trait, and associated free function, is deprecated
  in favor of inherent implementations.

* A wide range of methods and constants for both integers and floating
  point numbers are now `#[stable]`, having been adjusted for integer
  guidelines.

* `is_positive` and `is_negative` are renamed to `is_sign_positive` and
  `is_sign_negative`, in order to address #22985

* The `Wrapping` type is moved to `std::num` and stabilized;
  `WrappingOps` is deprecated in favor of inherent methods on the
  integer types, and direct implementation of operations on
  `Wrapping<X>` for each concrete integer type `X`.

Closes #22985
Closes #21069

[breaking-change]

r? @alexcrichton
---

5d0beb7d85e8e711334c7fb6f2c5da270e5200cb
diff --cc src/librustc_lint/builtin.rs
index 586a1eb085c,b765c484bff..e7443af3013
--- a/src/librustc_lint/builtin.rs
+++ b/src/librustc_lint/builtin.rs
@@@ -39,9 -39,8 +39,8 @@@ use util::ppaux::ty_to_string
  use util::nodemap::{FnvHashMap, NodeSet};
  use lint::{Level, Context, LintPass, LintArray, Lint};
  
 -use std::collections::BitSet;
 +use std::collections::{HashSet, BitSet};
  use std::collections::hash_map::Entry::{Occupied, Vacant};
- use std::num::SignedInt;
  use std::{cmp, slice};
  use std::{i8, i16, i32, i64, u8, u16, u32, u64, f32, f64};