Support /// comments (fixes #25)

Author: fornwall

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rust-script"
-version = "0.14.0"
+version = "0.15.0"
 edition = "2018"
 authors = ["Fredrik Fornwall <[email protected]>"]
 description = "Command-line tool to run Rust \"scripts\" which can make use of crates."

src/manifest.rs

@@ -20,14 +20,14 @@ lazy_static! {
     static ref RE_MARGIN: Regex = Regex::new(r"^\s*\*( |$)").unwrap();
     static ref RE_SPACE: Regex = Regex::new(r"^(\s+)").unwrap();
     static ref RE_NESTING: Regex = Regex::new(r"/\*|\*/").unwrap();
-    static ref RE_COMMENT: Regex = Regex::new(r"^\s*//!").unwrap();
+    static ref RE_COMMENT: Regex = Regex::new(r"^\s*//(!|/)").unwrap();
     static ref RE_SHEBANG: Regex = Regex::new(r"^#![^\[].*?(\r\n|\n)").unwrap();
     static ref RE_CRATE_COMMENT: Regex = {
         Regex::new(
             r"(?x)
                 # We need to find the first `/*!` or `//!` that *isn't* preceeded by something that would make it apply to anything other than the crate itself.  Because we can't do this accurately, we'll just require that the doc comment is the *first* thing in the file (after the optional shebang, which should already have been stripped).
                 ^\s*
-                (/\*!|//!)
+                (/\*!|//(!|/))
             "
         ).unwrap()
     };
@@ -938,7 +938,7 @@ fn extract_comment(s: &str) -> MainResult<String> {
 
     if let Some(stripped) = s.strip_prefix("/*!") {
         extract_block(stripped)
-    } else if s.starts_with("//!") {
+    } else if s.starts_with("//!") || s.starts_with("///") {
         extract_line(s)
     } else {
         Err("no doc comment found".into())

tests/data/outer-line-doc.rs

@@ -0,0 +1,10 @@
+/// ```cargo
+/// [dependencies]
+/// boolinator = "=0.1.0"
+/// ```
+use boolinator::Boolinator;
+
+pub fn main() {
+    println!("--output--");
+    println!("{:?}", true.as_some(1));
+}

tests/tests/script.rs

@@ -171,6 +171,15 @@ fn test_pub_fn_main() {
     .unwrap()
 }
 
+#[test]
+fn test_outer_line_doc() {
+    let out = rust_script!("tests/data/outer-line-doc.rs").unwrap();
+    scan!(out.stdout_output();
+        ("Some(1)") => ()
+    )
+        .unwrap()
+}
+
 #[test]
 fn test_whitespace_before_main() {
     let out = rust_script!("tests/data/whitespace-before-main.rs").unwrap();