github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

replace try with ?

Browse source
This commit is contained in:
schaeff 2019-08-19 09:11:28 +02:00
parent 07507cc89e
commit 83577051d6
7 changed files with 68 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -2310,7 +2310,7 @@ dependencies = [
[[package]]
name = "zokrates_cli"
version = "0.4.9"
version = "0.4.10"
dependencies = [
"assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2320,7 +2320,7 @@ dependencies = [
"regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_core 0.3.12",
"zokrates_core 0.3.13",
"zokrates_field 0.3.3",
"zokrates_fs_resolver 0.4.1",
"zokrates_github_resolver 0.1.0",
@ -2328,7 +2328,7 @@ dependencies = [
[[package]]
name = "zokrates_core"
version = "0.3.12"
version = "0.3.13"
dependencies = [
"assert_cli 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bellman_ce 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2356,7 +2356,7 @@ dependencies = [
"wasmi 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_embed 0.1.0",
"zokrates_field 0.3.3",
"zokrates_pest_ast 0.1.1",
"zokrates_pest_ast 0.1.2",
]
[[package]]
@ -2402,7 +2402,7 @@ dependencies = [
[[package]]
name = "zokrates_parser"
version = "0.1.1"
version = "0.1.2"
dependencies = [
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2411,7 +2411,7 @@ dependencies = [
[[package]]
name = "zokrates_pest_ast"
version = "0.1.1"
version = "0.1.2"
dependencies = [
"from-pest 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2419,7 +2419,7 @@ dependencies = [
"pest 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"pest-ast 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_field 0.3.3",
"zokrates_parser 0.1.1",
"zokrates_parser 0.1.2",
]
[[package]]
@ -2431,7 +2431,7 @@ dependencies = [
"serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"zokrates_core 0.3.12",
"zokrates_core 0.3.13",
"zokrates_field 0.3.3",
"zokrates_fs_resolver 0.4.1",
]

36
zokrates_core/src/absy/mod.rs
View file

@ -172,17 +172,17 @@ impl<'ast, T: Field> fmt::Display for Statement<'ast, T> {
Statement::Definition(ref lhs, ref rhs) => write!(f, "{} = {}", lhs, rhs),
Statement::Condition(ref lhs, ref rhs) => write!(f, "{} == {}", lhs, rhs),
Statement::For(ref var, ref start, ref stop, ref list) => {
r#try!(write!(f, "for {} in {}..{} do\n", var, start, stop));
write!(f, "for {} in {}..{} do\n", var, start, stop)?;
for l in list {
r#try!(write!(f, "\t\t{}\n", l));
write!(f, "\t\t{}\n", l)?;
}
write!(f, "\tendfor")
}
Statement::MultipleDefinition(ref ids, ref rhs) => {
for (i, id) in ids.iter().enumerate() {
r#try!(write!(f, "{}", id));
write!(f, "{}", id)?;
if i < ids.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, " = {}", rhs)
@ -201,9 +201,9 @@ impl<'ast, T: Field> fmt::Debug for Statement<'ast, T> {
}
Statement::Condition(ref lhs, ref rhs) => write!(f, "Condition({:?}, {:?})", lhs, rhs),
Statement::For(ref var, ref start, ref stop, ref list) => {
r#try!(write!(f, "for {:?} in {:?}..{:?} do\n", var, start, stop));
write!(f, "for {:?} in {:?}..{:?} do\n", var, start, stop)?;
for l in list {
r#try!(write!(f, "\t\t{:?}\n", l));
write!(f, "\t\t{:?}\n", l)?;
}
write!(f, "\tendfor")
}
@ -362,11 +362,11 @@ impl<'ast, T: Field> fmt::Display for Expression<'ast, T> {
condition, consequent, alternative
),
Expression::FunctionCall(ref i, ref p) => {
r#try!(write!(f, "{}(", i,));
write!(f, "{}(", i,)?;
for (i, param) in p.iter().enumerate() {
r#try!(write!(f, "{}", param));
write!(f, "{}", param)?;
if i < p.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")
@ -379,11 +379,11 @@ impl<'ast, T: Field> fmt::Display for Expression<'ast, T> {
Expression::And(ref lhs, ref rhs) => write!(f, "{} && {}", lhs, rhs),
Expression::Not(ref exp) => write!(f, "!{}", exp),
Expression::InlineArray(ref exprs) => {
r#try!(write!(f, "["));
write!(f, "[")?;
for (i, e) in exprs.iter().enumerate() {
r#try!(write!(f, "{}", e));
write!(f, "{}", e)?;
if i < exprs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, "]")
@ -411,8 +411,8 @@ impl<'ast, T: Field> fmt::Debug for Expression<'ast, T> {
condition, consequent, alternative
),
Expression::FunctionCall(ref i, ref p) => {
r#try!(write!(f, "FunctionCall({:?}, (", i));
r#try!(f.debug_list().entries(p.iter()).finish());
write!(f, "FunctionCall({:?}, (", i)?;
f.debug_list().entries(p.iter()).finish()?;
write!(f, ")")
}
Expression::Lt(ref lhs, ref rhs) => write!(f, "{} < {}", lhs, rhs),
@ -423,8 +423,8 @@ impl<'ast, T: Field> fmt::Debug for Expression<'ast, T> {
Expression::And(ref lhs, ref rhs) => write!(f, "{} && {}", lhs, rhs),
Expression::Not(ref exp) => write!(f, "!{}", exp),
Expression::InlineArray(ref exprs) => {
r#try!(write!(f, "InlineArray(["));
r#try!(f.debug_list().entries(exprs.iter()).finish());
write!(f, "InlineArray([")?;
f.debug_list().entries(exprs.iter()).finish()?;
write!(f, "]")
}
Expression::Select(ref array, ref index) => write!(f, "{}[{}]", array, index),
@ -451,9 +451,9 @@ impl<'ast, T: Field> ExpressionList<'ast, T> {
impl<'ast, T: Field> fmt::Display for ExpressionList<'ast, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
for (i, param) in self.expressions.iter().enumerate() {
r#try!(write!(f, "{}", param));
write!(f, "{}", param)?;
if i < self.expressions.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, "")

4
zokrates_core/src/flat_absy/mod.rs
View file

@ -339,9 +339,9 @@ pub struct FlatExpressionList<T: Field> {
impl<T: Field> fmt::Display for FlatExpressionList<T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
for (i, param) in self.expressions.iter().enumerate() {
r#try!(write!(f, "{}", param));
write!(f, "{}", param)?;
if i < self.expressions.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, "")

14
zokrates_core/src/semantics.rs
View file

@ -45,21 +45,21 @@ pub struct FunctionQuery<'ast> {
impl<'ast> fmt::Display for FunctionQuery<'ast> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
r#try!(write!(f, "("));
write!(f, "(")?;
for (i, t) in self.inputs.iter().enumerate() {
r#try!(write!(f, "{}", t));
write!(f, "{}", t)?;
if i < self.inputs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
r#try!(write!(f, ") -> ("));
write!(f, ") -> (")?;
for (i, t) in self.outputs.iter().enumerate() {
match t {
Some(t) => r#try!(write!(f, "{}", t)),
None => r#try!(write!(f, "_")),
Some(t) => write!(f, "{}", t)?,
None => write!(f, "_")?,
}
if i < self.outputs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")

54
zokrates_core/src/typed_absy/mod.rs
View file

@ -218,11 +218,11 @@ impl<'ast, T: Field> fmt::Debug for TypedStatement<'ast, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
TypedStatement::Return(ref exprs) => {
r#try!(write!(f, "Return("));
write!(f, "Return(")?;
for (i, expr) in exprs.iter().enumerate() {
r#try!(write!(f, "{}", expr));
write!(f, "{}", expr)?;
if i < exprs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")
@ -235,9 +235,9 @@ impl<'ast, T: Field> fmt::Debug for TypedStatement<'ast, T> {
write!(f, "Condition({:?}, {:?})", lhs, rhs)
}
TypedStatement::For(ref var, ref start, ref stop, ref list) => {
r#try!(write!(f, "for {:?} in {:?}..{:?} do\n", var, start, stop));
write!(f, "for {:?} in {:?}..{:?} do\n", var, start, stop)?;
for l in list {
r#try!(write!(f, "\t\t{:?}\n", l));
write!(f, "\t\t{:?}\n", l)?;
}
write!(f, "\tendfor")
}
@ -252,11 +252,11 @@ impl<'ast, T: Field> fmt::Display for TypedStatement<'ast, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
TypedStatement::Return(ref exprs) => {
r#try!(write!(f, "return "));
write!(f, "return ")?;
for (i, expr) in exprs.iter().enumerate() {
r#try!(write!(f, "{}", expr));
write!(f, "{}", expr)?;
if i < exprs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, "")
@ -265,17 +265,17 @@ impl<'ast, T: Field> fmt::Display for TypedStatement<'ast, T> {
TypedStatement::Definition(ref lhs, ref rhs) => write!(f, "{} = {}", lhs, rhs),
TypedStatement::Condition(ref lhs, ref rhs) => write!(f, "{} == {}", lhs, rhs),
TypedStatement::For(ref var, ref start, ref stop, ref list) => {
r#try!(write!(f, "for {} in {}..{} do\n", var, start, stop));
write!(f, "for {} in {}..{} do\n", var, start, stop)?;
for l in list {
r#try!(write!(f, "\t\t{}\n", l));
write!(f, "\t\t{}\n", l)?;
}
write!(f, "\tendfor")
}
TypedStatement::MultipleDefinition(ref ids, ref rhs) => {
for (i, id) in ids.iter().enumerate() {
r#try!(write!(f, "{}", id));
write!(f, "{}", id)?;
if i < ids.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, " = {}", rhs)
@ -484,11 +484,11 @@ impl<'ast, T: Field> fmt::Display for FieldElementExpression<'ast, T> {
)
}
FieldElementExpression::FunctionCall(ref i, ref p) => {
r#try!(write!(f, "{}(", i,));
write!(f, "{}(", i,)?;
for (i, param) in p.iter().enumerate() {
r#try!(write!(f, "{}", param));
write!(f, "{}", param)?;
if i < p.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")
@ -529,11 +529,11 @@ impl<'ast, T: Field> fmt::Display for FieldElementArrayExpression<'ast, T> {
.join(", ")
),
FieldElementArrayExpression::FunctionCall(_, ref i, ref p) => {
r#try!(write!(f, "{}(", i,));
write!(f, "{}(", i,)?;
for (i, param) in p.iter().enumerate() {
r#try!(write!(f, "{}", param));
write!(f, "{}", param)?;
if i < p.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")
@ -575,8 +575,8 @@ impl<'ast, T: Field> fmt::Debug for FieldElementExpression<'ast, T> {
)
}
FieldElementExpression::FunctionCall(ref i, ref p) => {
r#try!(write!(f, "FunctionCall({:?}, (", i));
r#try!(f.debug_list().entries(p.iter()).finish());
write!(f, "FunctionCall({:?}, (", i)?;
f.debug_list().entries(p.iter()).finish()?;
write!(f, ")")
}
FieldElementExpression::Select(ref id, ref index) => {
@ -592,8 +592,8 @@ impl<'ast, T: Field> fmt::Debug for FieldElementArrayExpression<'ast, T> {
FieldElementArrayExpression::Identifier(_, ref var) => write!(f, "{:?}", var),
FieldElementArrayExpression::Value(_, ref values) => write!(f, "{:?}", values),
FieldElementArrayExpression::FunctionCall(_, ref i, ref p) => {
r#try!(write!(f, "FunctionCall({:?}, (", i));
r#try!(f.debug_list().entries(p.iter()).finish());
write!(f, "FunctionCall({:?}, (", i)?;
f.debug_list().entries(p.iter()).finish()?;
write!(f, ")")
}
FieldElementArrayExpression::IfElse(ref condition, ref consequent, ref alternative) => {
@ -611,11 +611,11 @@ impl<'ast, T: Field> fmt::Display for TypedExpressionList<'ast, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
TypedExpressionList::FunctionCall(ref i, ref p, _) => {
r#try!(write!(f, "{}(", i,));
write!(f, "{}(", i,)?;
for (i, param) in p.iter().enumerate() {
r#try!(write!(f, "{}", param));
write!(f, "{}", param)?;
if i < p.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")
@ -628,8 +628,8 @@ impl<'ast, T: Field> fmt::Debug for TypedExpressionList<'ast, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
TypedExpressionList::FunctionCall(ref i, ref p, _) => {
r#try!(write!(f, "FunctionCall({:?}, (", i));
r#try!(f.debug_list().entries(p.iter()).finish());
write!(f, "FunctionCall({:?}, (", i)?;
f.debug_list().entries(p.iter()).finish()?;
write!(f, ")")
}
}

12
zokrates_core/src/types/signature.rs
View file

@ -19,18 +19,18 @@ impl fmt::Debug for Signature {
impl fmt::Display for Signature {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
r#try!(write!(f, "("));
write!(f, "(")?;
for (i, t) in self.inputs.iter().enumerate() {
r#try!(write!(f, "{}", t));
write!(f, "{}", t)?;
if i < self.inputs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
r#try!(write!(f, ") -> ("));
write!(f, ") -> (")?;
for (i, t) in self.outputs.iter().enumerate() {
r#try!(write!(f, "{}", t));
write!(f, "{}", t)?;
if i < self.outputs.len() - 1 {
r#try!(write!(f, ", "));
write!(f, ", ")?;
}
}
write!(f, ")")

1
zokrates_field/src/field.rs
View file

@ -800,5 +800,4 @@ mod tests {
assert_eq!(FieldPrime::from_bellman(a), cc);
}
}
}