about summary refs log tree commit diff
path: root/src/rustdoc
diff options
context:
space:
mode:
authorPaul Stansifer <paul.stansifer@gmail.com>2012-06-06 09:50:08 -0700
committerPaul Stansifer <paul.stansifer@gmail.com>2012-06-15 12:41:41 -0700
commit1e36d216bebc9ae5b1bfd2cd013e7e707199cdf7 (patch)
treebc39925f522d9f49baebf161a558df46a12e691d /src/rustdoc
parent85ded92736290073b6c591c2607ee3d829cb2874 (diff)
downloadrust-1e36d216bebc9ae5b1bfd2cd013e7e707199cdf7.tar.gz
rust-1e36d216bebc9ae5b1bfd2cd013e7e707199cdf7.zip
Add the interner to parse_sess.
Diffstat (limited to 'src/rustdoc')
-rw-r--r--src/rustdoc/attr_parser.rs10
-rw-r--r--src/rustdoc/parse.rs17
2 files changed, 3 insertions, 24 deletions
diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs
index ca0878626a4..4f4ce761e12 100644
--- a/src/rustdoc/attr_parser.rs
+++ b/src/rustdoc/attr_parser.rs
@@ -27,15 +27,7 @@ mod test {
         import syntax::codemap;
         import syntax::diagnostic;
 
-        let cm = codemap::new_codemap();
-        let handler = diagnostic::mk_handler(none);
-        let parse_sess = @{
-            cm: cm,
-            mut next_id: 0,
-            span_diagnostic: diagnostic::mk_span_handler(handler, cm),
-            mut chpos: 0u,
-            mut byte_pos: 0u
-        };
+        let parse_sess = syntax::parse::new_parse_sess(none);
         let parser = parse::new_parser_from_source_str(
             parse_sess, [], "-", codemap::fss_none, @source);
 
diff --git a/src/rustdoc/parse.rs b/src/rustdoc/parse.rs
index 7428369f6b4..9b0291cd8a1 100644
--- a/src/rustdoc/parse.rs
+++ b/src/rustdoc/parse.rs
@@ -10,27 +10,14 @@ import syntax::parse;
 
 export from_file, from_str, from_file_sess, from_str_sess;
 
-fn new_parse_sess() -> parse::parse_sess {
-    let cm = codemap::new_codemap();
-    let handler = diagnostic::mk_handler(none);
-    let sess = @{
-        cm: cm,
-        mut next_id: 1,
-        span_diagnostic: diagnostic::mk_span_handler(handler, cm),
-        mut chpos: 0u,
-        mut byte_pos: 0u
-    };
-    ret sess;
-}
-
 fn from_file(file: str) -> @ast::crate {
     parse::parse_crate_from_file(
-        file, [], new_parse_sess())
+        file, [], parse::new_parse_sess(none))
 }
 
 fn from_str(source: str) -> @ast::crate {
     parse::parse_crate_from_source_str(
-        "-", @source, [], new_parse_sess())
+        "-", @source, [], parse::new_parse_sess(none))
 }
 
 fn from_file_sess(sess: session::session, file: str) -> @ast::crate {