mirror of
https://github.com/casey/just.git
synced 2024-11-22 02:09:44 +03:00
Merge 6fc9e54577
into beb275ac30
This commit is contained in:
commit
6c66f35c4e
@ -182,6 +182,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
|
|||||||
unstable_features.insert(UnstableFeature::ScriptInterpreterSetting);
|
unstable_features.insert(UnstableFeature::ScriptInterpreterSetting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let source = root.canonicalize().unwrap();
|
||||||
let root = paths.get(root).unwrap();
|
let root = paths.get(root).unwrap();
|
||||||
|
|
||||||
Ok(Justfile {
|
Ok(Justfile {
|
||||||
@ -205,7 +206,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
|
|||||||
name,
|
name,
|
||||||
recipes,
|
recipes,
|
||||||
settings,
|
settings,
|
||||||
source: root.into(),
|
source,
|
||||||
unexports: self.unexports,
|
unexports: self.unexports,
|
||||||
unstable_features,
|
unstable_features,
|
||||||
warnings: self.warnings,
|
warnings: self.warnings,
|
||||||
|
@ -23,7 +23,6 @@ pub(crate) struct Justfile<'src> {
|
|||||||
pub(crate) name: Option<Name<'src>>,
|
pub(crate) name: Option<Name<'src>>,
|
||||||
pub(crate) recipes: Table<'src, Rc<Recipe<'src>>>,
|
pub(crate) recipes: Table<'src, Rc<Recipe<'src>>>,
|
||||||
pub(crate) settings: Settings<'src>,
|
pub(crate) settings: Settings<'src>,
|
||||||
#[serde(skip)]
|
|
||||||
pub(crate) source: PathBuf,
|
pub(crate) source: PathBuf,
|
||||||
pub(crate) unexports: HashSet<String>,
|
pub(crate) unexports: HashSet<String>,
|
||||||
#[serde(skip)]
|
#[serde(skip)]
|
||||||
|
1987
tests/json.rs
1987
tests/json.rs
File diff suppressed because it is too large
Load Diff
@ -167,6 +167,11 @@ impl Test {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn stdout_with_tempdir(mut self, stdout_fn: impl Fn(&TempDir) -> String) -> Self {
|
||||||
|
self.stdout = stdout_fn(&self.tempdir);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn stdout_regex(mut self, stdout_regex: impl AsRef<str>) -> Self {
|
pub(crate) fn stdout_regex(mut self, stdout_regex: impl AsRef<str>) -> Self {
|
||||||
self.stdout_regex = Some(Regex::new(&format!("^{}$", stdout_regex.as_ref())).unwrap());
|
self.stdout_regex = Some(Regex::new(&format!("^{}$", stdout_regex.as_ref())).unwrap());
|
||||||
self
|
self
|
||||||
|
Loading…
Reference in New Issue
Block a user