about summary refs log tree commit diff
path: root/src/rustc
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-07-02 15:31:33 -0700
committerBrian Anderson <banderson@mozilla.com>2012-07-02 15:31:33 -0700
commit47f43da376ebb54b6e7dbd0d8de9d192decc2dfe (patch)
tree8ff5efbf09add7d7ef26627c1e2af8068f210bc7 /src/rustc
parent7a4ebcefcb6294af590cfd3262845b2d61303df7 (diff)
parent569467eb0d110dd299cb2efcce13e998d1d9c11f (diff)
downloadrust-47f43da376ebb54b6e7dbd0d8de9d192decc2dfe.tar.gz
rust-47f43da376ebb54b6e7dbd0d8de9d192decc2dfe.zip
Merge branch 'doc-comments'
Diffstat (limited to 'src/rustc')
-rw-r--r--src/rustc/driver/session.rs3
-rw-r--r--src/rustc/metadata/decoder.rs3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rustc/driver/session.rs b/src/rustc/driver/session.rs
index 92e7b6bf598..5c0dc72f33a 100644
--- a/src/rustc/driver/session.rs
+++ b/src/rustc/driver/session.rs
@@ -233,7 +233,8 @@ mod test {
                 ast::meta_name_value(
                     @"crate_type",
                     ast_util::respan(ast_util::dummy_sp(),
-                                     ast::lit_str(@t))))
+                                     ast::lit_str(@t)))),
+            is_sugared_doc: false
         })
     }
 
diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index d069b4046bc..ccb3472325b 100644
--- a/src/rustc/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
@@ -613,7 +613,8 @@ fn get_attributes(md: ebml::doc) -> ~[ast::attribute] {
             assert (vec::len(meta_items) == 1u);
             let meta_item = meta_items[0];
             vec::push(attrs,
-                      {node: {style: ast::attr_outer, value: *meta_item},
+                      {node: {style: ast::attr_outer, value: *meta_item,
+                              is_sugared_doc: false},
                        span: ast_util::dummy_sp()});
         };
       }