Revert "Merge pull request #99 from resolritter/doc_comments"

This reverts commit 67d304c, reversing
changes made to 5993f53.

Author: maxbrunsfeld

corpus/source_files.txt

@@ -55,36 +55,6 @@ Line comments
 (source_file
   (line_comment))
 
-============================================
-Doc comments
-============================================
-
-/// Doc
-/// Comment
-// / Now a line comment (note the space separating the third slash)
-
-/// Doc
-/// Comment
-//// Four slashes makes the line a normal comment
-/// Doc comment got interrupted by the line above
-
-//! Inner doc comment line 1
-//! Inner doc comment line 2
-/// This is different doc comment since the line starts differently
-//! Back to inner doc comment
-
-----
-
-(source_file
-  (doc_comment)
-  (line_comment)
-  (doc_comment)
-  (line_comment)
-  (doc_comment)
-  (doc_comment)
-  (doc_comment)
-  (doc_comment))
-
 =====================================
 Greek letters in identifiers
 =====================================

grammar.js

@@ -38,15 +38,13 @@ const primitive_types = numeric_types.concat(['bool', 'str', 'char'])
 module.exports = grammar({
   name: 'rust',
 
-  extras: $ => [/\s/, $.line_comment, $.block_comment, $.doc_comment],
+  extras: $ => [/\s/, $.line_comment, $.block_comment],
 
   externals: $ => [
     $._string_content,
     $.raw_string_literal,
     $.float_literal,
     $.block_comment,
-    $.line_comment,
-    $.doc_comment
   ],
 
   supertypes: $ => [
@@ -1428,6 +1426,15 @@ module.exports = grammar({
 
     boolean_literal: $ => choice('true', 'false'),
 
+    comment: $ => choice(
+      $.line_comment,
+      $.block_comment
+    ),
+
+    line_comment: $ => token(seq(
+      '//', /.*/
+    )),
+
     _path: $ => choice(
       $.self,
       alias(choice(...primitive_types), $.identifier),

src/grammar.json

@@ -8173,6 +8173,35 @@
         }
       ]
     },
+    "comment": {
+      "type": "CHOICE",
+      "members": [
+        {
+          "type": "SYMBOL",
+          "name": "line_comment"
+        },
+        {
+          "type": "SYMBOL",
+          "name": "block_comment"
+        }
+      ]
+    },
+    "line_comment": {
+      "type": "TOKEN",
+      "content": {
+        "type": "SEQ",
+        "members": [
+          {
+            "type": "STRING",
+            "value": "//"
+          },
+          {
+            "type": "PATTERN",
+            "value": ".*"
+          }
+        ]
+      }
+    },
     "_path": {
       "type": "CHOICE",
       "members": [
@@ -8353,10 +8382,6 @@
     {
       "type": "SYMBOL",
       "name": "block_comment"
-    },
-    {
-      "type": "SYMBOL",
-      "name": "doc_comment"
     }
   ],
   "conflicts": [
@@ -8402,14 +8427,6 @@
     {
       "type": "SYMBOL",
       "name": "block_comment"
-    },
-    {
-      "type": "SYMBOL",
-      "name": "line_comment"
-    },
-    {
-      "type": "SYMBOL",
-      "name": "doc_comment"
     }
   ],
   "inline": [

src/node-types.json

@@ -4939,10 +4939,6 @@
     "type": "default",
     "named": false
   },
-  {
-    "type": "doc_comment",
-    "named": true
-  },
   {
     "type": "dyn",
     "named": false