adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Compare commits

base: adrian:0a4019ea19d0d4d6b3cbdc88108408788b801772
Branches Tags
adrian:master
..
compare: adrian:9dd2da3cc4aa04be962894a2d9380100fdc49817
Branches Tags
adrian:master

No commits in common. "0a4019ea19d0d4d6b3cbdc88108408788b801772" and "9dd2da3cc4aa04be962894a2d9380100fdc49817" have entirely different histories.
0a4019ea19 ... 9dd2da3cc4

2 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/builder.rs
View file

@ -161,7 +161,7 @@ impl<D: Clone> SymbolBuilder<KeyAndCertBundle<D>> for DefaultBuilder {
target: &<KeyAndCertBundle<D> as Resource>::Artifact, target: &<KeyAndCertBundle<D> as Resource>::Artifact,
(cert_chain, key): <Self::Prerequisites as ToArtifact>::Artifact, (cert_chain, key): <Self::Prerequisites as ToArtifact>::Artifact,
) -> Self::Symbol { ) -> Self::Symbol {
ConcatSymbol::new([key.0, cert_chain.0], target.0.clone()) ConcatSymbol::new([cert_chain.0, key.0], target.0.clone())
} }
} }

23
src/setup.rs
View file

@ -128,9 +128,7 @@ macro_rules! runnable_for_tuple {
#[allow(unused)] #[allow(unused)]
fn run<_R: SymbolRunner>(&self, runner: &_R, force: bool) -> Result<bool, Box<dyn Error>> { fn run<_R: SymbolRunner>(&self, runner: &_R, force: bool) -> Result<bool, Box<dyn Error>> {
let ($($name,)*) = self; let ($($name,)*) = self;
let mut result = false; Ok($(runner.run_symbol($name, force)? || )* false)
$(result = runner.run_symbol($name, force)? || result;)*
Ok(result)
} }
} }
); );
@ -344,23 +342,4 @@ mod test {
setup.add(TestResource("A", "B")).unwrap(); setup.add(TestResource("A", "B")).unwrap();
assert_eq!(*count.borrow(), 0); assert_eq!(*count.borrow(), 0);
} }
#[test]
fn correctly_handles_symbol_tuples() {
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: false }, TestSymbol { reached: false }), false).unwrap();
assert_eq!(*count.borrow(), 2);
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: true }, TestSymbol { reached: false }), false).unwrap();
assert_eq!(*count.borrow(), 1);
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: false }, TestSymbol { reached: true }), false).unwrap();
assert_eq!(*count.borrow(), 1);
let (count, setup) = get_setup();
setup.run_symbol((TestSymbol { reached: true }, TestSymbol { reached: true }), true).unwrap();
assert_eq!(*count.borrow(), 2);
}
} }