Skip to content

Commit 2042da4

Browse files
committed
---
yaml --- r: 121461 b: refs/heads/snap-stage3 c: cdccecb h: refs/heads/master i: 121459: 147c4de v: v3
1 parent bbc7b84 commit 2042da4

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 7a93beef7f692b34168ad69633f56483d38ad8fc
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d6a4c431f4ea819ffffed987167319f14e809955
4+
refs/heads/snap-stage3: cdccecb24f5c467282b73413494343d3848b4e5a
55
refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/num/int_macros.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ impl FromStrRadix for $T {
5959
/// # Examples
6060
///
6161
/// ```
62+
/// #![allow(deprecated)]
63+
///
6264
/// std::int::to_str_bytes(123, 10, |v| {
6365
/// assert!(v == "123".as_bytes());
6466
/// });

branches/snap-stage3/src/libstd/num/uint_macros.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ impl FromStrRadix for $T {
6060
/// # Examples
6161
///
6262
/// ```
63+
/// #![allow(deprecated)]
64+
///
6365
/// std::uint::to_str_bytes(123, 10, |v| {
6466
/// assert!(v == "123".as_bytes());
6567
/// });

branches/snap-stage3/src/test/compile-fail/repeat_count.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ fn main() {
1414
let n = 1;
1515
let a = [0, ..n]; //~ ERROR expected constant integer for repeat count but found variable
1616
let b = [0, ..()]; //~ ERROR expected positive integer for repeat count but found ()
17+
//~^ ERROR: expected `uint` but found `()`
1718
let c = [0, ..true]; //~ ERROR expected positive integer for repeat count but found boolean
19+
//~^ ERROR: expected `uint` but found `bool`
1820
let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count but found float
21+
//~^ ERROR: expected `uint` but found `<generic float #0>`
1922
let e = [0, .."foo"]; //~ ERROR expected positive integer for repeat count but found string
23+
//~^ ERROR: expected `uint` but found `&'static str`
2024
let f = [0, ..-4];
2125
//~^ ERROR expected positive integer for repeat count but found negative integer
2226
}

branches/snap-stage3/src/test/debuginfo/generic-function.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ fn dup_tup<T0: Clone, T1: Clone>(t0: &T0, t1: &T1) -> ((T0, T1), (T1, T0)) {
5555

5656
fn main() {
5757

58-
let _ = dup_tup(&1, &2.5);
59-
let _ = dup_tup(&3.5, &4_u16);
60-
let _ = dup_tup(&5, &Struct { a: 6, b: 7.5 });
58+
let _ = dup_tup(&1i, &2.5f64);
59+
let _ = dup_tup(&3.5f64, &4_u16);
60+
let _ = dup_tup(&5i, &Struct { a: 6, b: 7.5 });
6161
}
6262

6363
fn zzz() {()}

branches/snap-stage3/src/test/debuginfo/generic-functions-nested.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ fn outer<TA: Clone>(a: TA) {
5252
}
5353

5454
fn main() {
55-
outer(-1);
56-
outer(-2.5);
55+
outer(-1i);
56+
outer(-2.5f64);
5757
}
5858

5959
fn zzz() {()}

branches/snap-stage3/src/test/run-pass/issue-15108.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags:-O
12-
1311
fn main() {}

0 commit comments

Comments
 (0)