Old messy WIP

Author: MarijnS95

src/artifact.rs

@@ -1,9 +1,11 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub enum Artifact {
     Root(String),
     Example(String),
+    // TODO: root, with a ty, because examples can also have a ty
+    Bin { name: String, path: PathBuf },
 }
 
 impl Artifact {

src/error.rs

@@ -13,6 +13,7 @@ pub enum Error {
     Glob(GlobError),
     Io(PathBuf, IoError),
     Toml(PathBuf, TomlError),
+    BinNotFound(String),
 }
 
 impl Display for Error {
@@ -25,6 +26,7 @@ impl Display for Error {
             Self::Glob(error) => return error.fmt(f),
             Self::Io(path, error) => return write!(f, "{}: {}", path.display(), error),
             Self::Toml(file, error) => return write!(f, "{}: {}", file.display(), error),
+            Self::BinNotFound(name) => return write!(f, "Can't find `{name}` bin at `src/bin/{name}.rs` or `src/bin/{name}/main.rs`. Please specify bin.path if you want to use a non-default path.", name = name),
         })
     }
 }

src/manifest.rs

@@ -1,6 +1,6 @@
 use crate::error::Error;
 use serde::Deserialize;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 #[derive(Debug, Deserialize)]
 pub struct Manifest {
@@ -9,6 +9,8 @@ pub struct Manifest {
     pub lib: Option<Lib>,
     #[serde(default, rename = "bin")]
     pub bins: Vec<Bin>,
+    #[serde(default, rename = "example")]
+    pub examples: Vec<Example>,
 }
 
 impl Manifest {
@@ -30,16 +32,33 @@ const fn default_true() -> bool {
 #[derive(Debug, Deserialize)]
 pub struct Package {
     pub name: String,
+
+    // https://doc.rust-lang.org/cargo/reference/cargo-targets.html#target-auto-discovery
     #[serde(default = "default_true")]
     pub autobins: bool,
+    #[serde(default = "default_true")]
+    pub autoexamples: bool,
+    // #[serde(default = "default_true")]
+    // pub autotests: bool,
+    // #[serde(default = "default_true")]
+    // pub autobenches: bool,
 }
 
 #[derive(Debug, Deserialize)]
 pub struct Lib {
     pub name: Option<String>,
+    pub path: Option<PathBuf>,
 }
 
 #[derive(Debug, Deserialize)]
 pub struct Bin {
     pub name: String,
+    pub path: Option<PathBuf>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Example {
+    pub name: String,
+    pub path: Option<PathBuf>,
+    // crate_type?
 }

src/subcommand.rs

@@ -82,6 +82,45 @@ impl Subcommand {
         // https://doc.rust-lang.org/cargo/reference/cargo-targets.html#target-auto-discovery
 
         let mut artifacts = vec![];
+
+        fn find_main_file(dir: &Path, name: &str) -> Option<PathBuf> {
+            let alt_path = dir.join(format!("{}.rs", name));
+            alt_path.is_file().then(|| alt_path).or_else(|| {
+                let alt_path = dir.join(format!("{}/main.rs", name));
+                alt_path.is_file().then(|| alt_path)
+            })
+        }
+
+        // Add all explicitly configured binaries
+        for bin in &parsed_manifest.bins {
+            let path = bin
+                .path
+                .clone()
+                .or_else(|| find_main_file(&root_dir.join("src/bin"), &bin.name))
+                .ok_or_else(|| Error::BinNotFound(bin.name.clone()))?;
+
+            artifacts.push(Artifact::Bin {
+                name: bin.name.clone(),
+                path,
+            });
+        }
+
+        // Add all explicitly configured examples
+        for example in &parsed_manifest.examples {
+            let path = example
+                .path
+                .clone()
+                .or_else(|| find_main_file(&root_dir.join("src/bin"), &example.name))
+                .ok_or_else(|| Error::BinNotFound(example.name.clone()))?;
+
+            artifacts.push(Artifact::Example {
+                name: example.name.clone(),
+                path,
+                // ty: example.crate_type?
+            });
+        }
+
+        // TODO: autoexamples
         if args.examples {
             for file in utils::list_rust_files(&root_dir.join("examples"))? {
                 artifacts.push(Artifact::Example(file));