Merge pull request #78 from fornwall/add-toolchain-to-cargo-toml

Add toolchain to cargo.toml

Author: fornwall

src/main.rs

@@ -361,15 +361,15 @@ impl InputAction {
 
             match fs::File::open(&built_binary_path) {
                 Ok(built_binary_file) => {
-                    let built_binary_mtime =
-                        built_binary_file.metadata().unwrap().modified().unwrap();
+                    // Use ctime instead of mtime as cargo may copy an already
+                    // built binary (with old mtime) here:
+                    let built_binary_ctime = built_binary_file.metadata()?.created()?;
                     match (fs::File::open(script_path), fs::File::open(manifest_path)) {
                         (Ok(script_file), Ok(manifest_file)) => {
-                            let script_mtime = script_file.metadata().unwrap().modified().unwrap();
-                            let manifest_mtime =
-                                manifest_file.metadata().unwrap().modified().unwrap();
-                            if built_binary_mtime.cmp(&script_mtime).is_ge()
-                                && built_binary_mtime.cmp(&manifest_mtime).is_ge()
+                            let script_mtime = script_file.metadata()?.modified()?;
+                            let manifest_mtime = manifest_file.metadata()?.modified()?;
+                            if built_binary_ctime.cmp(&script_mtime).is_ge()
+                                && built_binary_ctime.cmp(&manifest_mtime).is_ge()
                             {
                                 return Ok(execute_command());
                             }
@@ -455,15 +455,6 @@ fn decide_action_for(
     info!("pkg_path: {:?}", pkg_path);
     info!("using_cache: {:?}", using_cache);
 
-    let (mani_str, script_str) = manifest::split_input(input, &deps, &prelude, &bin_name)?;
-
-    // Forcibly override some flags based on build kind.
-    let debug = match args.build_kind {
-        BuildKind::Normal => args.debug,
-        BuildKind::Test => true,
-        BuildKind::Bench => false,
-    };
-
     let toolchain_version = args
         .toolchain_version
         .clone()
@@ -472,6 +463,16 @@ fn decide_action_for(
             _ => None,
         });
 
+    let (mani_str, script_str) =
+        manifest::split_input(input, &deps, &prelude, &bin_name, toolchain_version.clone())?;
+
+    // Forcibly override some flags based on build kind.
+    let debug = match args.build_kind {
+        BuildKind::Normal => args.debug,
+        BuildKind::Test => true,
+        BuildKind::Bench => false,
+    };
+
     Ok(InputAction {
         cargo_output: args.cargo_output,
         force_compile: args.force,

src/manifest.rs

@@ -43,6 +43,7 @@ pub fn split_input(
     deps: &[(String, String)],
     prelude_items: &[String],
     bin_name: &str,
+    toolchain: Option<String>,
 ) -> MainResult<(String, String)> {
     fn contains_main_method(line: &str) -> bool {
         let line = line.trim_start();
@@ -111,7 +112,28 @@ pub fn split_input(
     let mani = merge_manifest(mani, dep_mani)?;
 
     // Fix up relative paths.
-    let mani = fix_manifest_paths(mani, &input.base_path())?;
+    let mut mani = fix_manifest_paths(mani, &input.base_path())?;
+
+    if let Some(toolchain) = toolchain {
+        let mut mani_map = toml::map::Map::new();
+        let mut package_map = toml::map::Map::new();
+        let mut metadata = toml::map::Map::new();
+        let mut rustscript_metadata = toml::map::Map::new();
+        rustscript_metadata.insert(
+            "toolchain".to_string(),
+            toml::value::Value::String(toolchain),
+        );
+        metadata.insert(
+            "rustscript".to_string(),
+            toml::value::Value::Table(rustscript_metadata),
+        );
+        package_map.insert("metadata".to_string(), toml::value::Value::Table(metadata));
+        mani_map.insert(
+            "package".to_string(),
+            toml::value::Value::Table(package_map),
+        );
+        mani = merge_manifest(mani, mani_map)?;
+    }
     info!("mani: {:?}", mani);
 
     let mani_str = format!("{}", mani);
@@ -130,9 +152,10 @@ strip = true
 #[test]
 fn test_split_input() {
     let bin_name = "binary-name".to_string();
+    let toolchain = None;
     macro_rules! si {
         ($i:expr) => {
-            split_input(&$i, &[], &[], &bin_name).ok()
+            split_input(&$i, &[], &[], &bin_name, toolchain.clone()).ok()
         };
     }
 
@@ -169,6 +192,38 @@ version = "0.1.0""#,
         )
     );
 
+    assert_eq!(
+        split_input(
+            &f(r#"fn main() {}"#),
+            &[],
+            &[],
+            &bin_name,
+            Some("stable".to_string())
+        )
+        .ok(),
+        r!(
+            format!(
+                "{}{}",
+                r#"[[bin]]
+name = "binary-name"
+path = "main.rs"
+
+[dependencies]
+
+[package]
+authors = ["Anonymous"]
+edition = "2021"
+name = "n"
+version = "0.1.0"
+
+[package.metadata.rustscript]
+toolchain = "stable""#,
+                STRIP_SECTION
+            ),
+            r#"fn main() {}"#
+        )
+    );
+
     // Ensure removed prefix manifests don't work.
     assert_eq!(
         si!(f(r#"