Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/check/src/harness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ fn check_harness_packages_valid(
program: &mut Program<CacheImpl>,
) -> Result<CheckResult, Error> {
let mut out = CheckResult {
check: "packages valid",
check: "packages valid".into(),
verdict: CheckVerdict::Skip,
err: vec![],
};
Expand Down
51 changes: 26 additions & 25 deletions crates/check/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use lcache::{Cache, CacheErr, LocalDir};
use op::{Options, Runnable, StandaloneTest};
use ot::{OpTracker, Operation};
use regex::Regex;
use std::borrow::Cow;
use std::cmp::Ordering;
use std::fmt;
use std::fmt::Display;
Expand Down Expand Up @@ -123,105 +124,105 @@ impl Display for CheckVerdict {

#[derive(Debug, Clone)]
pub struct CheckResult {
pub check: &'static str,
pub check: Cow<'static, str>,
pub verdict: CheckVerdict,
pub err: Vec<String>,
}

impl CheckResult {
pub(crate) fn parse_failure(msg: String) -> Self {
CheckResult {
check: "parse",
check: "parse".into(),
verdict: CheckVerdict::Fail,
err: vec![msg],
}
}

pub(crate) fn profile_name_skip() -> Self {
CheckResult {
check: "profile name matches dir",
check: "profile name matches dir".into(),
verdict: CheckVerdict::Skip,
err: vec![],
}
}

pub(crate) fn profile_name_pass() -> Self {
CheckResult {
check: "profile name matches dir",
check: "profile name matches dir".into(),
verdict: CheckVerdict::Pass,
err: vec![],
}
}

pub(crate) fn profile_name_fail(msg: String) -> Self {
CheckResult {
check: "profile name matches dir",
check: "profile name matches dir".into(),
verdict: CheckVerdict::Fail,
err: vec![msg],
}
}

pub(crate) fn harness_name_skip() -> Self {
CheckResult {
check: "harness name matches dir",
check: "harness name matches dir".into(),
verdict: CheckVerdict::Skip,
err: vec![],
}
}
pub(crate) fn harness_name_pass() -> Self {
CheckResult {
check: "harness name matches dir",
check: "harness name matches dir".into(),
verdict: CheckVerdict::Pass,
err: vec![],
}
}
pub(crate) fn harness_name_fail(msg: String) -> Self {
CheckResult {
check: "harness name matches dir",
check: "harness name matches dir".into(),
verdict: CheckVerdict::Fail,
err: vec![msg],
}
}

pub(crate) fn harness_regexes_skip() -> Self {
CheckResult {
check: "project_matchers regexes",
check: "project_matchers regexes".into(),
verdict: CheckVerdict::Skip,
err: vec![],
}
}
pub(crate) fn harness_regexes_pass() -> Self {
CheckResult {
check: "project_matchers regexes",
check: "project_matchers regexes".into(),
verdict: CheckVerdict::Pass,
err: vec![],
}
}
pub(crate) fn harness_regexes_fail(msg: String) -> Self {
CheckResult {
check: "project_matchers regexes",
check: "project_matchers regexes".into(),
verdict: CheckVerdict::Fail,
err: vec![msg],
}
}

pub(crate) fn harness_predicates_skip() -> Self {
CheckResult {
check: "project_matchers predicates",
check: "project_matchers predicates".into(),
verdict: CheckVerdict::Skip,
err: vec![],
}
}
pub(crate) fn harness_predicates_pass() -> Self {
CheckResult {
check: "project_matchers predicates",
check: "project_matchers predicates".into(),
verdict: CheckVerdict::Pass,
err: vec![],
}
}
pub(crate) fn harness_predicates_fail(msg: String) -> Self {
CheckResult {
check: "project_matchers predicates",
check: "project_matchers predicates".into(),
verdict: CheckVerdict::Fail,
err: vec![msg],
}
Expand Down Expand Up @@ -545,7 +546,7 @@ impl FileBasedChecker for ParseCheck {
) -> Result<CheckResult, Error> {
if ctx.skip_checkers.contains(&"parse".to_string()) {
return Ok(CheckResult {
check: "parse",
check: "parse".into(),
verdict: CheckVerdict::Skip,
err: vec![],
});
Expand All @@ -568,7 +569,7 @@ impl FileBasedChecker for ParseCheck {
Ok(p) => p,
Err(e) => {
return Ok(CheckResult {
check: "parse",
check: "parse".into(),
verdict: CheckVerdict::Fail,
err: vec![format!("{}", e)],
});
Expand All @@ -585,7 +586,7 @@ impl FileBasedChecker for ParseCheck {

if let Err(e) = program.typecheck(nickel_lang_core::typecheck::TypecheckMode::Walk) {
return Ok(CheckResult {
check: "parse",
check: "parse".into(),
verdict: CheckVerdict::Fail,
err: vec![report_as_str(
&mut program.files(),
Expand All @@ -596,7 +597,7 @@ impl FileBasedChecker for ParseCheck {
}
if let Err(e) = program.compile() {
return Ok(CheckResult {
check: "parse",
check: "parse".into(),
verdict: CheckVerdict::Fail,
err: vec![report_as_str(
&mut program.files(),
Expand All @@ -608,7 +609,7 @@ impl FileBasedChecker for ParseCheck {

drop(generated_lib_dir);
Ok(CheckResult {
check: "parse",
check: "parse".into(),
verdict: CheckVerdict::Pass,
err: vec![],
})
Expand All @@ -633,7 +634,7 @@ impl FileBasedChecker for ImportLineCheck {
let fix = ctx.fix;
let mut result = CheckResult {
verdict: CheckVerdict::Pass,
check: "import line",
check: "import line".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"import line".to_string()) {
Expand Down Expand Up @@ -747,7 +748,7 @@ impl FileBasedChecker for FmtCheck {
let fix = ctx.fix;
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "fmt",
check: "fmt".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"fmt".to_string()) {
Expand Down Expand Up @@ -814,7 +815,7 @@ impl GraphBasedChecker for StandaloneTestCheck {
let cache = ctx.cache.clone();
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "standalone tests",
check: "standalone tests".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"standalone tests".to_string()) {
Expand Down Expand Up @@ -921,7 +922,7 @@ impl FileBasedChecker for ImportsCheck {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Pass,
check: "imports",
check: "imports".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"imports".to_string()) {
Expand Down Expand Up @@ -1029,7 +1030,7 @@ impl GraphBasedChecker for BuildScriptDisallowedPatterns {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "build script disallowed-patterns",
check: "build script disallowed-patterns".into(),
err: vec![],
};
if ctx
Expand Down Expand Up @@ -1105,7 +1106,7 @@ impl GraphBasedChecker for BuildScriptIsExecutable {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "build scripts are executable",
check: "build scripts are executable".into(),
err: vec![],
};
if ctx
Expand Down
10 changes: 5 additions & 5 deletions crates/check/src/naming.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl crate::GraphBasedChecker for SpecNameMatchesDir {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "spec name matches dir",
check: "spec name matches dir".into(),
err: vec![],
};
if ctx
Expand Down Expand Up @@ -59,7 +59,7 @@ impl crate::GraphBasedChecker for SpecNameValid {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "spec name valid",
check: "spec name valid".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"spec name valid".to_string()) {
Expand Down Expand Up @@ -97,7 +97,7 @@ impl crate::GraphBasedChecker for CycleBreakerNaming {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "cycle breaker naming",
check: "cycle breaker naming".into(),
err: vec![],
};
if ctx
Expand Down Expand Up @@ -147,7 +147,7 @@ impl crate::GraphBasedChecker for OutputNaming {
) -> Result<CheckResult, Error> {
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "output naming",
check: "output naming".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"output naming".to_string()) {
Expand Down Expand Up @@ -212,7 +212,7 @@ impl crate::GraphBasedChecker for EnumerateBins {
let cache = ctx.cache.clone();
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "enumerate bins",
check: "enumerate bins".into(),
err: vec![],
};
if ctx.skip_checkers.contains(&"enumerate bins".to_string()) {
Expand Down
4 changes: 2 additions & 2 deletions crates/check/src/outputs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl crate::GraphBasedChecker for OutputTypesValid {
let cache = ctx.cache.clone();
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "output types valid",
check: "output types valid".into(),
err: vec![],
};
if ctx
Expand Down Expand Up @@ -123,7 +123,7 @@ impl crate::GraphBasedChecker for MissingRuntimeDeps {
let cache = ctx.cache.clone();
let mut result = CheckResult {
verdict: CheckVerdict::Skip,
check: "missing runtime_deps",
check: "missing runtime_deps".into(),
err: vec![],
};
if ctx
Expand Down
2 changes: 1 addition & 1 deletion crates/check/src/profile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ fn check_profile_parses(
program: &mut Program<CacheImpl>,
) -> Result<CheckResult, Error> {
let mut out = CheckResult {
check: "profile parses",
check: "profile parses".into(),
err: vec![],
verdict: CheckVerdict::Pass,
};
Expand Down
1 change: 1 addition & 0 deletions crates/remote-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ tokio-stream.workspace = true
tokio-util.workspace = true
tonic.workspace = true

check.workspace = true
common.workspace = true
graph.workspace = true
orchestrator.workspace = true
Expand Down
Loading