about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser/attr.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-11-07 00:10:52 +0000
committerbors <bors@rust-lang.org>2019-11-07 00:10:52 +0000
commitcaf018714189db0b15f9f803adfcb4572ab7a988 (patch)
treeafeb3f84214024f4ee487367e35c64f7f2ce4771 /src/libsyntax/parse/parser/attr.rs
parent38048763e885a3ee139abf39d59a530b16484150 (diff)
parenteea6f23a0ed67fd8c6b8e1b02cda3628fee56b2f (diff)
downloadrust-caf018714189db0b15f9f803adfcb4572ab7a988.tar.gz
rust-caf018714189db0b15f9f803adfcb4572ab7a988.zip
Auto merge of #65750 - nnethercote:cheaper-doc-comments, r=petrochenkov
Cheaper doc comments

This PR implements the idea from #60935: represent doc comments more cheaply, rather than converting them into `#[doc="..."]` attribute form. Unlike #60936 (which is about coalescing doc comments to reduce their number), this approach does not have any backwards compatibility concerns, and it eliminates about 80-90% of the current cost of doc comments (as estimated using the numbers in #60930, which eliminated the cost of doc comments entirely by treating them as normal comments).

r? @petrochenkov
Diffstat (limited to 'src/libsyntax/parse/parser/attr.rs')
-rw-r--r--src/libsyntax/parse/parser/attr.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser/attr.rs b/src/libsyntax/parse/parser/attr.rs
index 188a144cac9..1c292661f24 100644
--- a/src/libsyntax/parse/parser/attr.rs
+++ b/src/libsyntax/parse/parser/attr.rs
@@ -43,7 +43,7 @@ impl<'a> Parser<'a> {
                     just_parsed_doc_comment = false;
                 }
                 token::DocComment(s) => {
-                    let attr = attr::mk_sugared_doc_attr(s, self.token.span);
+                    let attr = attr::mk_doc_comment(s, self.token.span);
                     if attr.style != ast::AttrStyle::Outer {
                         let mut err = self.fatal("expected outer doc comment");
                         err.note("inner doc comments like this (starting with \
@@ -150,10 +150,9 @@ impl<'a> Parser<'a> {
         };
 
         Ok(ast::Attribute {
-            item,
+            kind: ast::AttrKind::Normal(item),
             id: attr::mk_attr_id(),
             style,
-            is_sugared_doc: false,
             span,
         })
     }
@@ -229,7 +228,7 @@ impl<'a> Parser<'a> {
                 }
                 token::DocComment(s) => {
                     // We need to get the position of this token before we bump.
-                    let attr = attr::mk_sugared_doc_attr(s, self.token.span);
+                    let attr = attr::mk_doc_comment(s, self.token.span);
                     if attr.style == ast::AttrStyle::Inner {
                         attrs.push(attr);
                         self.bump();