Skip to content

Commit cb5574d

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 193839 b: refs/heads/beta c: 8256241 h: refs/heads/master i: 193837: 099b014 193835: 97bb85b 193831: 0384308 193823: 07029ac v: v3
1 parent aabd2d0 commit cb5574d

File tree

7 files changed

+2473
-2
lines changed

7 files changed

+2473
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 3ab26f84698bf30572f3bc9336570c422f59aa2a
34+
refs/heads/beta: 8256241d3af28bd835b267e27b6e24aeb5e799bd
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/src/librustc/middle/check_match.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use middle::ty;
2727
use std::cmp::Ordering;
2828
use std::fmt;
2929
use std::iter::{range_inclusive, AdditiveIterator, FromIterator, IntoIterator, repeat};
30+
#[cfg(stage0)]
3031
use std::num::Float;
3132
use std::slice;
3233
use syntax::ast::{self, DUMMY_NODE_ID, NodeId, Pat};

branches/beta/src/libserialize/json.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ use std::io::prelude::*;
204204
use std::io;
205205
use std::mem::{swap};
206206
use std::num::FpCategory as Fp;
207+
#[cfg(stage0)]
207208
use std::num::{Float, Int};
208209
use std::ops::Index;
209210
use std::str::FromStr;
@@ -2622,7 +2623,6 @@ mod tests {
26222623
StackElement, Stack, Decoder, Encoder, EncoderError};
26232624
use std::{i64, u64, f32, f64};
26242625
use std::collections::BTreeMap;
2625-
use std::num::Float;
26262626
use std::string;
26272627

26282628
#[derive(RustcDecodable, Eq, PartialEq, Debug)]

0 commit comments

Comments
 (0)