Skip to content

Commit cbb1ea9

Browse files
committed
---
yaml --- r: 7295 b: refs/heads/master c: c59a0ec h: refs/heads/master i: 7293: eb0f6b4 7291: 277030c 7287: 10c73e5 7279: ab4bcfc 7263: 7eafbb4 7231: d60f211 7167: eddabcf v: v3
1 parent da74173 commit cbb1ea9

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 377316d8f607aeb4dda448abb14c8169adfba770
2+
refs/heads/master: c59a0ec774bbbd2cf6ad9e6154ffc93ff3ffde3f

trunk/src/rustdoc/parse.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
export from_file, from_str;
2+
3+
fn new_parse_sess() -> parser::parse_sess {
4+
let cm = codemap::new_codemap();
5+
let sess = @{
6+
cm: cm,
7+
mutable next_id: 0,
8+
diagnostic: diagnostic::mk_handler(cm, none)
9+
};
10+
ret sess;
11+
}
12+
13+
fn from_file(file: str) -> @ast::crate {
14+
parser::parse_crate_from_source_file(
15+
file, [], new_parse_sess())
16+
}
17+
18+
fn from_str(source: str) -> @ast::crate {
19+
parser::parse_crate_from_source_str(
20+
"-", source, [], new_parse_sess())
21+
}

trunk/src/rustdoc/rustdoc.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
#[desc = "The Rust documentation generator"];
77
#[license = "MIT"];
88
#[crate_type = "bin"];
9+
10+
mod parse;

trunk/src/rustdoc/rustdoc.rs

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -177,30 +177,6 @@ fn doc_header(rd: rustdoc, name: str) {
177177
rd.w.write_line("# Crate " + name);
178178
}
179179

180-
mod parse {
181-
export from_file, from_str;
182-
183-
fn new_parse_sess() -> parser::parse_sess {
184-
let cm = codemap::new_codemap();
185-
let sess = @{
186-
cm: cm,
187-
mutable next_id: 0,
188-
diagnostic: diagnostic::mk_handler(cm, none)
189-
};
190-
ret sess;
191-
}
192-
193-
fn from_file(file: str) -> @ast::crate {
194-
parser::parse_crate_from_source_file(
195-
file, [], new_parse_sess())
196-
}
197-
198-
fn from_str(source: str) -> @ast::crate {
199-
parser::parse_crate_from_source_str(
200-
"-", source, [], new_parse_sess())
201-
}
202-
}
203-
204180
#[doc(
205181
brief = "Main function.",
206182
desc = "Command-line arguments:

0 commit comments

Comments
 (0)