ci-web: Reorganize to fix build warnings

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

5 files changed, 7 insertions, 18 deletions

diff --git a/ci-web/Cargo.toml b/ci-web/Cargo.toml
index 10108f0..6cadcf7 100644
--- a/ci-web/Cargo.toml
+++ b/ci-web/Cargo.toml
@@ -1,16 +1,8 @@
 [package]
-name = "ci-cgi"
+name = "ci_cgi"
 version = "0.1.0"
 edition = "2021"
 
-[[bin]]
-name = "get-test-job"
-path = "src/get-test-job.rs"
-
-[[bin]]
-name = "gen-commit-summary"
-path = "src/gen-commit-summary.rs"
-
 #[workspace]
 #members = ["get-test-job", "ci-cgi"]
 
diff --git a/ci-web/src/main.rs b/ci-web/src/bin/cgi.rs
index 30ea932..e0776c5 100644
--- a/ci-web/src/main.rs
+++ b/ci-web/src/bin/cgi.rs
@@ -4,10 +4,9 @@ use regex::Regex;
 extern crate cgi;
 extern crate querystring;
 
-mod lib;
-use lib::*;
+use ci_cgi::{Ktestrc, ktestrc_read, TestResultsMap, TestStatus, read_lines, commitdir_get_results_toml, git_get_commit};
 
-const COMMIT_FILTER:    &str = include_str!("../commit-filter");
+const COMMIT_FILTER:    &str = include_str!("../../commit-filter");
 const STYLESHEET:       &str = "bootstrap.min.css";
 
 fn filter_results(r: TestResultsMap, tests_matching: &Regex) -> TestResultsMap {
diff --git a/ci-web/src/gen-commit-summary.rs b/ci-web/src/bin/gen-commit-summary.rs
index 1da81f0..5a3c3a4 100644
--- a/ci-web/src/gen-commit-summary.rs
+++ b/ci-web/src/bin/gen-commit-summary.rs
@@ -1,6 +1,5 @@
 use std::process;
-mod lib;
-use lib::{ktestrc_read, commitdir_get_results, TestResults};
+use ci_cgi::{ktestrc_read, commitdir_get_results, TestResults};
 use clap::Parser;
 use toml;
 
diff --git a/ci-web/src/get-test-job.rs b/ci-web/src/bin/get-test-job.rs
index 85e6feb..d1ab61f 100644
--- a/ci-web/src/get-test-job.rs
+++ b/ci-web/src/bin/get-test-job.rs
@@ -6,8 +6,7 @@ use std::path::{Path, PathBuf};
 use std::process;
 use std::time::SystemTime;
 use memoize::memoize;
-mod lib;
-use lib::*;
+use ci_cgi::{Ktestrc, ktestrc_read, read_lines, git_get_commit, commitdir_get_results_toml};
 
 use multimap::MultiMap;
 use die::die;
diff --git a/ci-web/src/lib.rs b/ci-web/src/lib.rs
index 6819a0d..b4bd65c 100644
--- a/ci-web/src/lib.rs
+++ b/ci-web/src/lib.rs
@@ -53,7 +53,7 @@ pub enum TestStatus {
 }
 
 impl TestStatus {
-    pub fn from_str(status: &str) -> TestStatus {
+    fn from_str(status: &str) -> TestStatus {
         if status.is_empty() {
             TestStatus::InProgress
         } else if status.contains("IN PROGRESS") {
@@ -107,7 +107,7 @@ pub struct TestResults {
     pub d:          TestResultsMap
 }
 
-pub fn read_test_result(testdir: &std::fs::DirEntry) -> Option<TestResult> {
+fn read_test_result(testdir: &std::fs::DirEntry) -> Option<TestResult> {
     Some(TestResult {
         status:     TestStatus::from_str(&read_to_string(&testdir.path().join("status")).ok()?),
         duration:   read_to_string(&testdir.path().join("duration")).unwrap_or("0".to_string()).parse().unwrap_or(0),