Skip to content

Commit 7879fe7

Browse files
committed
---
yaml --- r: 50355 b: refs/heads/auto c: ae7e072 h: refs/heads/master i: 50353: 2a1a6b0 50351: 41f3fe5 v: v3
1 parent 41ab651 commit 7879fe7

File tree

7 files changed

+31
-14
lines changed

7 files changed

+31
-14
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: ef56aa62fb4d672d04e5634bad001d427aa6b553
17+
refs/heads/auto: ae7e072af756ce256826370ec16f7d51ce1bed86
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/RELEASES.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Version 0.6 (April 2013)
1+
Version 0.6 (March 2013)
22
---------------------------
33

44
* ~2100 changes, numerous bugfixes

branches/auto/src/libcore/prelude.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ pub use ops::{Shl, Shr, Index};
2121
pub use option::{Option, Some, None};
2222
pub use result::{Result, Ok, Err};
2323

24-
/* Reexported functions */
25-
26-
pub use io::{print, println};
27-
2824
/* Reexported types and traits */
2925

3026
pub use clone::Clone;

branches/auto/src/libcore/str.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,7 @@ pub fn each_split_within<'a>(ss: &'a str,
726726

727727
(B, Cr, UnderLim) => { B }
728728
(B, Cr, OverLim) if (i - last_start + 1) > lim
729-
=> fail!(fmt!("word starting with %? longer than limit!",
730-
self::slice(ss, last_start, i + 1))),
729+
=> { fail!(~"word longer than limit!") }
731730
(B, Cr, OverLim) => { slice(); slice_start = last_start; B }
732731
(B, Ws, UnderLim) => { last_end = i; C }
733732
(B, Ws, OverLim) => { last_end = i; slice(); A }

branches/auto/src/librustc/driver/driver.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,8 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
762762
optflag(~"", ~"test", ~"Build a test harness"),
763763
optopt(~"", ~"target",
764764
~"Target triple cpu-manufacturer-kernel[-os]
765-
to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/
765+
to compile for (see
766+
http://sources.redhat.com/autobook/autobook/autobook_17.html
766767
for detail)", ~"TRIPLE"),
767768
optopt(~"", ~"android-cross-path",
768769
~"The path to the Android NDK", "PATH"),

branches/auto/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3107,15 +3107,11 @@ pub impl Parser {
31073107
// XXX: clownshoes
31083108
let ident = special_idents::clownshoes_extensions;
31093109

3110-
// Special case: if the next identifier that follows is '(', don't
3111-
// allow this to be parsed as a trait.
3112-
let could_be_trait = *self.token != token::LPAREN;
3113-
31143110
// Parse the trait.
31153111
let mut ty = self.parse_ty(false);
31163112

31173113
// Parse traits, if necessary.
3118-
let opt_trait = if could_be_trait && self.eat_keyword(&~"for") {
3114+
let opt_trait = if self.eat_keyword(&~"for") {
31193115
// New-style trait. Reinterpret the type as a trait.
31203116
let opt_trait_ref = match ty.node {
31213117
ty_path(path, node_id) => {
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
struct Node<'self, T> {
12+
val: T,
13+
next: Option<&'self Node<'self, T>>
14+
}
15+
16+
impl<'self, T> Node<'self, T> {
17+
fn get(&self) -> &'self T {
18+
match self.next {
19+
Some(ref next) => next.get(),
20+
None => &self.val
21+
}
22+
}
23+
}
24+
25+
fn main() {}

0 commit comments

Comments
 (0)