Skip to content

Commit 7cfcf04

Browse files
committed
---
yaml --- r: 83780 b: refs/heads/try c: 6db8899 h: refs/heads/master v: v3
1 parent f202631 commit 7cfcf04

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
5-
refs/heads/try: 8ac0d0a59ee47d9f8027955ca13f545f89bcc687
5+
refs/heads/try: 6db889996be763ca9e429982894eb0e8d9d002cc
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/num/num.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,8 +567,9 @@ macro_rules! impl_to_primitive_float_to_float(
567567
Some(*self as $DstT)
568568
} else {
569569
let n = *self as f64;
570+
let min_value: $SrcT = Bounded::min_value();
570571
let max_value: $SrcT = Bounded::max_value();
571-
if -max_value as f64 <= n && n <= max_value as f64 {
572+
if min_value as f64 <= n && n <= max_value as f64 {
572573
Some(*self as $DstT)
573574
} else {
574575
None

branches/try/src/libsyntax/parse/token.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -499,30 +499,11 @@ fn mk_fresh_ident_interner() -> @ident_interner {
499499
@interner::StrInterner::prefill(init_vec)
500500
}
501501

502-
// NOTE remove stage0 pub'ed special cases after next snapshot.
503-
#[cfg(stage0)]
504-
pub static SELF_KEYWORD_NAME: uint = 8;
505-
#[cfg(not(stage0))]
506502
static SELF_KEYWORD_NAME: uint = 8;
507-
#[cfg(stage0)]
508-
pub static STATIC_KEYWORD_NAME: uint = 27;
509-
#[cfg(not(stage0))]
510503
static STATIC_KEYWORD_NAME: uint = 27;
511-
#[cfg(stage0)]
512-
pub static STRICT_KEYWORD_START: uint = 32;
513-
#[cfg(not(stage0))]
514504
static STRICT_KEYWORD_START: uint = 32;
515-
#[cfg(stage0)]
516-
pub static STRICT_KEYWORD_FINAL: uint = 64;
517-
#[cfg(not(stage0))]
518505
static STRICT_KEYWORD_FINAL: uint = 64;
519-
#[cfg(stage0)]
520-
pub static RESERVED_KEYWORD_START: uint = 65;
521-
#[cfg(not(stage0))]
522506
static RESERVED_KEYWORD_START: uint = 65;
523-
#[cfg(stage0)]
524-
pub static RESERVED_KEYWORD_FINAL: uint = 71;
525-
#[cfg(not(stage0))]
526507
static RESERVED_KEYWORD_FINAL: uint = 71;
527508

528509
// if an interner exists in TLS, return it. Otherwise, prepare a

branches/try/src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-10-07 c919629
2+
freebsd-x86_64 c9af0c52bdcc1ffe2db4c9a3a1aaae66ff7fcc2c
3+
linux-i386 0245cb9e57c9b39f3441e9768256783ba76be6e7
4+
linux-x86_64 483d9bd109316e647a11d387653568d95e3581e6
5+
macos-i386 c12154816a8f5cd7b2c758250859cf6abf3eddbf
6+
macos-x86_64 9d46c31618a3bbd6ddffa598f1350e16c620621b
7+
winnt-i386 b111d291a15ff7f02aba9c59bb81ae7a3cd86628
8+
19
S 2013-10-04 8bb55db
210
freebsd-x86_64 8b68b99033e68f5d98e3e3d077de9d2e085be1ba
311
linux-i386 10bc0069efdca378155640963d70d3a08a7248dc

0 commit comments

Comments
 (0)