ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-11-24 07:48:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

cargo +nightly clippy

Browse Source
This commit is contained in:
collin 2020-12-04 19:06:29 -05:00
parent cd53cba77a
commit 7745710dc4
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/src/errors/statement.rs
View File

@ -136,8 +136,8 @@ impl StatementError {
}
pub fn multiple_returns(span: Span) -> Self {
let message =
format!("This function returns multiple times and produces unreachable circuits with undefined behavior.");
let message = "This function returns multiple times and produces unreachable circuits with undefined behavior."
.to_string();
Self::new_from_span(message, span)
}

2
compiler/src/function/function.rs
View File

@ -111,6 +111,6 @@ impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
// Conditionally select a result based on returned indicators
Self::conditionally_select_result(cs, function.output, results, &function.span)
.map_err(|err| FunctionError::StatementError(err))
.map_err(FunctionError::StatementError)
}
}

6
compiler/src/function/result/result.rs
View File

@ -67,7 +67,11 @@ impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
};
// Error if the function or one of its branches does not return.
if let None = results.iter().find(|(indicator, _res)| get_indicator_value(indicator)) {
if results
.iter()
.find(|(indicator, _res)| get_indicator_value(indicator))
.is_none()
{
return Err(StatementError::no_returns(return_type, span.to_owned()));
}

2
compiler/src/statement/statement.rs
View File

@ -124,7 +124,7 @@ impl<F: Field + PrimeField, G: GroupType<F>> ConstrainedProgram<F, G> {
match &value {
ConstrainedValue::Tuple(values) => {
if !values.is_empty() {
results.push((indicator.clone(), value));
results.push((*indicator, value));
}
}
_ => return Err(StatementError::unassigned(expression_string, span)),