github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-23 20:28:36 +00:00
Code Issues Projects Releases Wiki Activity

remove left out commented out conflicts

Browse source
This commit is contained in:
schaeff 2021-08-12 21:14:24 +02:00
parent 81c537769c
commit 9ce5827596
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1157,23 +1157,6 @@ pub struct StructExpression<'ast, T> {
inner: StructExpressionInner<'ast, T>,
}
// <<<<<<< HEAD
// impl<'ast, T: Field> StructExpression<'ast, T> {
// pub fn try_from_typed(
// e: TypedExpression<'ast, T>,
// target_struct_ty: StructType<'ast, T>,
// ) -> Result<Self, TypedExpression<'ast, T>> {
// match e {
// TypedExpression::Struct(e) => {
// if e.ty() == &target_struct_ty {
// Ok(e)
// } else {
// Err(TypedExpression::Struct(e))
// }
// }
// e => Err(e),
// }
// =======
impl<'ast, T> StructExpression<'ast, T> {
pub fn ty(&self) -> &StructType<'ast, T> {
&self.ty
@ -1189,7 +1172,6 @@ impl<'ast, T> StructExpression<'ast, T> {
pub fn into_inner(self) -> StructExpressionInner<'ast, T> {
self.inner
// >>>>>>> 5a02186fc1d5c8f438a9663112f444497e752ea6
}
}