Skip to content

Commit da74173

Browse files
committed
---
yaml --- r: 7294 b: refs/heads/master c: 377316d h: refs/heads/master v: v3
1 parent eb0f6b4 commit da74173

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
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: 0e65ddfaea1c25c0fb2f20a2d28ed782c1dff369
2+
refs/heads/master: 377316d8f607aeb4dda448abb14c8169adfba770

trunk/src/rustdoc/rustdoc.rs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,26 @@ fn doc_header(rd: rustdoc, name: str) {
178178
}
179179

180180
mod parse {
181-
fn from_file(file: str) -> @ast::crate {
181+
export from_file, from_str;
182+
183+
fn new_parse_sess() -> parser::parse_sess {
182184
let cm = codemap::new_codemap();
183185
let sess = @{
184186
cm: cm,
185187
mutable next_id: 0,
186188
diagnostic: diagnostic::mk_handler(cm, none)
187189
};
188-
parser::parse_crate_from_source_file(file, [], sess)
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())
189201
}
190202
}
191203

0 commit comments

Comments
 (0)