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

update clippy

Browse source
This commit is contained in:
schaeff 2021-03-05 17:24:21 +01:00
parent 870752d58d
commit 30a1abba8f
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
zokrates_abi/src/lib.rs
View file

@ -196,15 +196,15 @@ impl<T: Field> Decode<T> for CheckedValue<T> {
match expected {
ConcreteType::Int => unreachable!(),
ConcreteType::FieldElement => CheckedValue::Field(raw.pop().unwrap()),
ConcreteType::Uint(UBitwidth::B8) => CheckedValue::U8(
u8::from_str_radix(&raw.pop().unwrap().to_dec_string(), 10).unwrap(),
),
ConcreteType::Uint(UBitwidth::B16) => CheckedValue::U16(
u16::from_str_radix(&raw.pop().unwrap().to_dec_string(), 10).unwrap(),
),
ConcreteType::Uint(UBitwidth::B32) => CheckedValue::U32(
u32::from_str_radix(&raw.pop().unwrap().to_dec_string(), 10).unwrap(),
),
ConcreteType::Uint(UBitwidth::B8) => {
CheckedValue::U8(raw.pop().unwrap().to_dec_string().parse().unwrap())
}
ConcreteType::Uint(UBitwidth::B16) => {
CheckedValue::U16(raw.pop().unwrap().to_dec_string().parse().unwrap())
}
ConcreteType::Uint(UBitwidth::B32) => {
CheckedValue::U32(raw.pop().unwrap().to_dec_string().parse().unwrap())
}
ConcreteType::Boolean => {
let v = raw.pop().unwrap();
CheckedValue::Boolean(if v == 0.into() {

18
zokrates_core/src/absy/from_ast.rs
View file

@ -581,15 +581,15 @@ impl<'ast> From<pest::DecimalLiteralExpression<'ast>> for absy::ExpressionNode<'
pest::DecimalSuffix::Field(_) => absy::Expression::FieldConstant(
BigUint::parse_bytes(&expression.value.span.as_str().as_bytes(), 10).unwrap(),
),
pest::DecimalSuffix::U32(_) => absy::Expression::U32Constant(
u32::from_str_radix(&expression.value.span.as_str(), 10).unwrap(),
),
pest::DecimalSuffix::U16(_) => absy::Expression::U16Constant(
u16::from_str_radix(&expression.value.span.as_str(), 10).unwrap(),
),
pest::DecimalSuffix::U8(_) => absy::Expression::U8Constant(
u8::from_str_radix(&expression.value.span.as_str(), 10).unwrap(),
),
pest::DecimalSuffix::U32(_) => {
absy::Expression::U32Constant(expression.value.span.as_str().parse().unwrap())
}
pest::DecimalSuffix::U16(_) => {
absy::Expression::U16Constant(expression.value.span.as_str().parse().unwrap())
}
pest::DecimalSuffix::U8(_) => {
absy::Expression::U8Constant(expression.value.span.as_str().parse().unwrap())
}
}
.span(expression.span),
None => absy::Expression::IntConstant(

2
zokrates_core/src/absy/node.rs
View file

@ -35,7 +35,7 @@ impl<T: fmt::Display> Node<T> {
pub trait NodeValue: fmt::Display + fmt::Debug + Sized + PartialEq {
fn at(self, line: usize, col: usize, delta: isize) -> Node<Self> {
let start = Position { col, line };
let start = Position { line, col };
Node::new(start, start.col(delta), self)
}

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

@ -146,8 +146,8 @@ impl<T: Field> FlatStatement<T> {
.collect();
FlatStatement::Directive(FlatDirective {
outputs,
inputs,
outputs,
..d
})
}

2
zokrates_core/src/ir/from_flat.rs
View file

@ -71,7 +71,7 @@ impl<T: Field> From<FlatProg<T>> for Prog<T> {
let main = main.into();
Prog { private, main }
Prog { main, private }
}
}

2
zokrates_core/src/typed_absy/types.rs
View file

@ -946,7 +946,7 @@ pub mod signature {
Constant::Concrete(s) => Ok(s.into()),
}?;
GType::Array(GArrayType { ty, size })
GType::Array(GArrayType { size, ty })
}
DeclarationType::FieldElement => GType::FieldElement,
DeclarationType::Boolean => GType::Boolean,