Skip to content

Commit c79cc7e

Browse files
committed
---
yaml --- r: 102223 b: refs/heads/master c: 4c553af h: refs/heads/master i: 102221: d829265 102219: c63f429 102215: cc9703c 102207: ab3d9f6 v: v3
1 parent 91598c8 commit c79cc7e

40 files changed

+1275
-1807
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 700fd35fb9d448c5e1658c3cec9c1153c57cc802
2+
refs/heads/master: 4c553af0f80c5693d832f43ce7021abba15c4535
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
55
refs/heads/try: a97642026c18a624ff6ea01075dd9550f8ed07ff

trunk/mk/crates.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ DEPS_test := std extra collections getopts serialize term
8181
DEPS_time := std serialize
8282

8383
TOOL_DEPS_compiletest := test green rustuv getopts
84-
TOOL_DEPS_rustdoc := rustdoc native
85-
TOOL_DEPS_rustc := rustc native
84+
TOOL_DEPS_rustdoc := rustdoc green rustuv
85+
TOOL_DEPS_rustc := rustc green rustuv
8686
TOOL_SOURCE_compiletest := $(S)src/compiletest/compiletest.rs
8787
TOOL_SOURCE_rustdoc := $(S)src/driver/driver.rs
8888
TOOL_SOURCE_rustc := $(S)src/driver/driver.rs

trunk/src/doc/rust.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3256,10 +3256,10 @@ An example of a *recursive* type and its use:
32563256
~~~~
32573257
enum List<T> {
32583258
Nil,
3259-
Cons(T, @List<T>)
3259+
Cons(T, ~List<T>)
32603260
}
32613261
3262-
let a: List<int> = Cons(7, @Cons(13, @Nil));
3262+
let a: List<int> = Cons(7, ~Cons(13, ~Nil));
32633263
~~~~
32643264

32653265
### Pointer types

trunk/src/driver/driver.rs

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

11-
#[no_uv];
12-
1311
#[cfg(rustdoc)]
1412
extern crate this = "rustdoc";
1513

1614
#[cfg(rustc)]
1715
extern crate this = "rustc";
1816

19-
extern crate native;
20-
21-
#[start]
22-
fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, this::main) }
17+
fn main() { this::main() }

0 commit comments

Comments
 (0)