Merge pull request #15 from fornwall/pub-fn-main

Pub fn main

Author: fornwall

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        rust: ["1.47.0", "1.48.0"]
+        rust: ["1.47.0", "1.49.0"]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout source

Cargo.lock

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

Cargo.toml

@@ -413,9 +413,9 @@ fn try_main() -> MainResult<i32> {
                 "dependency somehow has three parts?!"
             );
 
-            if name == "" {
+            if name.is_empty() {
                 return Err(("cannot have empty dependency package name").into());
-            } else if version == "" {
+            } else if version.is_empty() {
                 return Err(("cannot have empty dependency version").into());
             }
 

src/main.rs

@@ -44,6 +44,13 @@ pub fn split_input(
     prelude_items: &[String],
     input_id: &OsString,
 ) -> MainResult<(String, String)> {
+    fn contains_main_method(line: &str) -> bool {
+        line.starts_with("fn main()")
+            || line.starts_with("pub fn main()")
+            || line.starts_with("async fn main()")
+            || line.starts_with("pub async fn main()")
+    }
+
     let template_buf;
     let (part_mani, source, template, sub_prelude) = match *input {
         Input::File(_, _, content, _) => {
@@ -52,10 +59,7 @@ pub fn split_input(
             let (manifest, source) =
                 find_embedded_manifest(content).unwrap_or((Manifest::Toml(""), content));
 
-            let source = if source
-                .lines()
-                .any(|line| line.starts_with("fn main()") || line.starts_with("async fn main()"))
-            {
+            let source = if source.lines().any(contains_main_method) {
                 source.to_string()
             } else {
                 format!("fn main() -> Result<(), Box<dyn std::error::Error+Sync+Send>> {{\n    {{\n    {}    }}\n    Ok(())\n}}", source)

src/manifest.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/data/pub-fn-main.rs

@@ -161,3 +161,12 @@ fn test_script_async_main() {
     )
     .unwrap()
 }
+
+#[test]
+fn test_pub_fn_main() {
+    let out = rust_script!("tests/data/pub-fn-main.rs").unwrap();
+    scan!(out.stdout_output();
+        ("Some(1)") => ()
+    )
+    .unwrap()
+}