---

yaml
---
r: 11069
b: refs/heads/master
c: 67b1034
h: refs/heads/master
i:
  11067: 2fab6e4
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fdf50e84b8e1db5228c7a03699c791066638222b
+refs/heads/master: 67b1034989709910bec0a97a2994640e45515255
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/attr_parser.rs

@@ -80,11 +80,10 @@ mod test {
 
     fn parse_attributes(source: str) -> [ast::attribute] {
         import rustc::syntax::parse::parser;
-        // FIXME: Uncommenting this results in rustc bugs
-        //import rustc::syntax::codemap;
+        import rustc::syntax::codemap;
         import rustc::driver::diagnostic;
 
-        let cm = rustc::syntax::codemap::new_codemap();
+        let cm = codemap::new_codemap();
         let handler = diagnostic::mk_handler(none);
         let parse_sess = @{
             cm: cm,

trunk/src/rustdoc/fold.rs

@@ -1,6 +1,3 @@
-// FIXME: Random import to solve the mystery resolve bug
-import std;
-
 export fold;
 export fold_crate, fold_mod, fold_fn;
 export default_seq_fold;