Merge pull request epage#80 from GitaWei/rm_cgo_deps_37

fix!: Remove `cargo-deps: syntax`

Author: epage

docs/README.md

@@ -49,7 +49,7 @@ Under the hood, a Cargo project will be generated and built (with the Cargo outp
 
 As seen from the above example, using a `fn main() {}` function is not required. If not present, the script file will be wrapped in a `fn main() { ... }` block.
 
-`rust-script` will look for embedded dependency and manifest information in the script as shown by the below two equivalent `now.rs` variants:
+`rust-script` will look for embedded dependency and manifest information in the script as shown by the below `now.rs` variants:
 
 ```rust
 #!/usr/bin/env rust-script
@@ -66,26 +66,6 @@ fn main() {
 }
 ```
 
-```rust
-// cargo-deps: time="0.1.25"
-// You can also leave off the version number, in which case, it's assumed
-// to be "*".  Also, the `cargo-deps` comment *must* be a single-line
-// comment, and it *must* be the first thing in the file, after the
-// shebang.
-// Multiple dependencies should be separated by commas:
-// cargo-deps: time="0.1.25", libc="0.2.5"
-fn main() {
-    println!("{}", time::now().rfc822z());
-}
-```
-
-The output from running one of the above scripts may look something like:
-
-```sh
-$ rust-script now
-Wed, 28 Oct 2020 00:38:45 +0100
-```
-
 Useful command-line arguments:
 
 - `--bench`: Compile and run benchmarks.  Requires a nightly toolchain.
@@ -122,27 +102,7 @@ The code given is embedded into a block expression, evaluated, and printed out u
 
 ## Filters
 
-You can use `rust-script` to write a quick filter, by specifying a closure to be called for each line read from stdin, like so:
-
-```sh
-$ cat now.ers | rust-script --loop \
-    "let mut n=0; move |l| {n+=1; println!(\"{:>6}: {}\",n,l.trim_right())}"
-     1: // cargo-deps: time="0.1.25"
-     3: fn main() {
-     4:     println!("{}", time::now().rfc822z());
-     5: }
-```
-
-You can achieve a similar effect to the above by using the `--count` flag, which causes the line number to be passed as a second argument to your closure:
-
-```sh
-$ cat now.ers | rust-script --count --loop \
-    "|l,n| println!(\"{:>6}: {}\", n, l.trim_right())"
-     1: // cargo-deps: time="0.1.25"
-     2: fn main() {
-     3:     println!("{}", time::now().rfc822z());
-     4: }
-```
+TBD
 
 Note that, like with expressions, you can specify a custom template for stream filters.
 
@@ -167,7 +127,10 @@ Templates are Rust source files with two placeholders: `#{prelude}` for the auto
 For example, a minimal expression template that adds a dependency and imports some additional symbols might be:
 
 ```rust
-// cargo-deps: itertools="0.6.2"
+//! ```cargo
+//! [dependencies]
+//! itertools="0.6.2"
+//! ```
 #![allow(unused_imports)]
 #{prelude}
 use std::io::prelude::*;

src/manifest.rs

@@ -14,9 +14,6 @@ use crate::Input;
 use log::{error, info};
 use std::ffi::OsString;
 
-static RE_SHORT_MANIFEST: once_cell::sync::Lazy<Regex> = once_cell::sync::Lazy::new(|| {
-    Regex::new(r"^(?i)\s*//\s*cargo-deps\s*:(.*?)(\r\n|\n)").unwrap()
-});
 static RE_MARGIN: once_cell::sync::Lazy<Regex> =
     once_cell::sync::Lazy::new(|| Regex::new(r"^\s*\*( |$)").unwrap());
 static RE_SPACE: once_cell::sync::Lazy<Regex> =
@@ -184,59 +181,6 @@ fn main() {}
         )
     );
 
-    assert_eq!(
-        si!(f(r#"
-// Cargo-Deps: time="0.1.25"
-fn main() {}
-"#)),
-        r!(
-            r#"[[bin]]
-name = "n_input_id"
-path = "n.rs"
-
-[dependencies]
-time = "0.1.25"
-
-[package]
-authors = ["Anonymous"]
-edition = "2018"
-name = "n"
-version = "0.1.0"
-"#,
-            r#"
-// Cargo-Deps: time="0.1.25"
-fn main() {}
-"#
-        )
-    );
-
-    assert_eq!(
-        si!(f(r#"
-// Cargo-Deps: time="0.1.25", libc="0.2.5"
-fn main() {}
-"#)),
-        r!(
-            r#"[[bin]]
-name = "n_input_id"
-path = "n.rs"
-
-[dependencies]
-libc = "0.2.5"
-time = "0.1.25"
-
-[package]
-authors = ["Anonymous"]
-edition = "2018"
-name = "n"
-version = "0.1.0"
-"#,
-            r#"
-// Cargo-Deps: time="0.1.25", libc="0.2.5"
-fn main() {}
-"#
-        )
-    );
-
     assert_eq!(
         si!(f(r#"
 /*!
@@ -329,8 +273,6 @@ enum Manifest<'s> {
     /// The manifest is a valid TOML fragment (owned).
     // TODO: Change to Cow<'s, str>.
     TomlOwned(String),
-    /// The manifest is a comma-delimited list of dependencies.
-    DepList(&'s str),
 }
 
 impl<'s> Manifest<'s> {
@@ -339,7 +281,6 @@ impl<'s> Manifest<'s> {
         match self {
             Toml(s) => toml::from_str(s),
             TomlOwned(ref s) => toml::from_str(s),
-            DepList(s) => Manifest::dep_list_to_toml(s),
         }
         .map_err(|e| {
             MainError::Tag(
@@ -348,26 +289,6 @@ impl<'s> Manifest<'s> {
             )
         })
     }
-
-    fn dep_list_to_toml(s: &str) -> ::std::result::Result<toml::value::Table, toml::de::Error> {
-        let mut r = String::new();
-        r.push_str("[dependencies]\n");
-        for dep in s.trim().split(',') {
-            // If there's no version specified, add one.
-            match dep.contains('=') {
-                true => {
-                    r.push_str(dep);
-                    r.push('\n');
-                }
-                false => {
-                    r.push_str(dep);
-                    r.push_str("=\"*\"\n");
-                }
-            }
-        }
-
-        toml::from_str(&r)
-    }
 }
 
 /**
@@ -376,7 +297,7 @@ Locates a manifest embedded in Rust source.
 Returns `Some((manifest, source))` if it finds a manifest, `None` otherwise.
 */
 fn find_embedded_manifest(s: &str) -> Option<(Manifest, &str)> {
-    find_short_comment_manifest(s).or_else(|| find_code_block_manifest(s))
+    find_code_block_manifest(s)
 }
 
 #[test]
@@ -433,59 +354,6 @@ fn main() {
         None
     );
 
-    assert_eq!(
-        fem("// cargo-deps: time=\"0.1.25\"
-fn main() {}
-"),
-        Some((
-            DepList(" time=\"0.1.25\""),
-            "// cargo-deps: time=\"0.1.25\"
-fn main() {}
-"
-        ))
-    );
-
-    assert_eq!(
-        fem("// cargo-deps: time=\"0.1.25\", libc=\"0.2.5\"
-fn main() {}
-"),
-        Some((
-            DepList(" time=\"0.1.25\", libc=\"0.2.5\""),
-            "// cargo-deps: time=\"0.1.25\", libc=\"0.2.5\"
-fn main() {}
-"
-        ))
-    );
-
-    assert_eq!(
-        fem("
-  // cargo-deps: time=\"0.1.25\"  \n\
-fn main() {}
-"),
-        Some((
-            DepList(" time=\"0.1.25\"  "),
-            "
-  // cargo-deps: time=\"0.1.25\"  \n\
-fn main() {}
-"
-        ))
-    );
-
-    assert_eq!(
-        fem("/* cargo-deps: time=\"0.1.25\" */
-fn main() {}
-"),
-        None
-    );
-
-    assert_eq!(
-        fem(r#"//! [dependencies]
-//! time = "0.1.25"
-fn main() {}
-"#),
-        None
-    );
-
     assert_eq!(
         fem(r#"//! ```Cargo
 //! [dependencies]
@@ -584,22 +452,6 @@ fn main() {}
     );
 }
 
-/**
-Locates a "short comment manifest" in Rust source.
-*/
-fn find_short_comment_manifest(s: &str) -> Option<(Manifest, &str)> {
-    /*
-    This is pretty simple: the only valid syntax for this is for the first, non-blank line to contain a single-line comment whose first token is `cargo-deps:`.  That's it.
-    */
-    let re = &*RE_SHORT_MANIFEST;
-    if let Some(cap) = re.captures(s) {
-        if let Some(m) = cap.get(1) {
-            return Some((Manifest::DepList(m.as_str()), s));
-        }
-    }
-    None
-}
-
 /**
 Locates a "code block manifest" in Rust source.
 */

tests/data/script-short-without-main.rs

@@ -1,4 +1,7 @@
-// cargo-deps: boolinator="0.1.0"
+//! ```cargo
+//! [dependencies]
+//! boolinator="0.1.0"
+//! ```
 
 extern crate boolinator;
 use boolinator::Boolinator;

tests/data/script-short.rs

@@ -1,4 +1,7 @@
-// cargo-deps: boolinator="0.1.0"
+//! ```cargo
+//! [dependencies]
+//! boolinator="0.1.0"
+//! ```
 
 extern crate boolinator;
 use boolinator::Boolinator;

tests/data/templates/boolinate.rs

@@ -1,6 +1,9 @@
-// cargo-deps: chrono
+//! ```cargo
+//! [dependencies]
+//! chrono="*"
+//! ```
 extern crate chrono;
 fn main() {
     println!("--output--");
     println!("Hello");
-}
+}

tests/data/templates/override/expr.rs

@@ -147,40 +147,6 @@ Hello, World!
     fixture.close();
 }
 
-#[test]
-fn test_script_short() {
-    let fixture = crate::util::Fixture::new();
-    fixture
-        .cmd()
-        .arg("tests/data/script-short.rs")
-        .assert()
-        .success()
-        .stdout_eq(
-            "--output--
-Some(1)
-",
-        );
-
-    fixture.close();
-}
-
-#[test]
-fn test_script_short_without_main() {
-    let fixture = crate::util::Fixture::new();
-    fixture
-        .cmd()
-        .arg("tests/data/script-short-without-main.rs")
-        .assert()
-        .success()
-        .stdout_eq(
-            "--output--
-Some(1)
-",
-        );
-
-    fixture.close();
-}
-
 #[test]
 fn test_script_test() {
     let fixture = crate::util::Fixture::new();