satisfy linter

Author: alex-ozdemir

src/front/zsharp/parser.rs

@@ -126,10 +126,7 @@ impl<'a> Loader for &'a ZLoad {
         debug!("Parsing: {}", p.as_ref().display());
         let s = self.sources.alloc(s);
         let ast = ast::generate_ast(s);
-        if ast.is_err() {
-            panic!("{}", ast.unwrap_err());
-        }
-        Ok(ast.unwrap())
+        Ok(ast.unwrap_or_else(|e| panic!("{}", e)))
     }
     fn includes<P: AsRef<Path>>(&self, ast: &Self::AST, p: &P) -> Vec<PathBuf> {
         let mut c = p.as_ref().to_path_buf();

src/front/zsharp/zvisit/zconstlitrw.rs

@@ -97,6 +97,7 @@ impl<'ast> ZVisitorMut<'ast> for ZConstLiteralRewriter {
         &mut self,
         dle: &mut ast::DecimalLiteralExpression<'ast>,
     ) -> ZVisitorResult {
+        #![allow(clippy::unnecessary_unwrap)]
         if dle.suffix.is_none() && self.to_ty.is_some() {
             self.found = true;
             dle.suffix.replace(match self.to_ty.as_ref().unwrap() {

src/front/zsharpcurly/parser.rs

@@ -126,10 +126,7 @@ impl<'a> Loader for &'a ZLoad {
         debug!("Parsing: {}", p.as_ref().display());
         let s = self.sources.alloc(s);
         let ast = ast::generate_ast(s);
-        if ast.is_err() {
-            panic!("{}", ast.unwrap_err());
-        }
-        Ok(ast.unwrap())
+        Ok(ast.unwrap_or_else(|e| panic!("{}", e)))
     }
     fn includes<P: AsRef<Path>>(&self, ast: &Self::AST, p: &P) -> Vec<PathBuf> {
         let mut c = p.as_ref().to_path_buf();

src/front/zsharpcurly/zvisit/zconstlitrw.rs

@@ -113,6 +113,7 @@ impl<'ast> ZVisitorMut<'ast> for ZConstLiteralRewriter {
         &mut self,
         dle: &mut ast::DecimalLiteralExpression<'ast>,
     ) -> ZVisitorResult {
+        #![allow(clippy::unnecessary_unwrap)]
         if dle.suffix.is_none() && self.to_ty.is_some() {
             self.found = true;
             dle.suffix.replace(match self.to_ty.as_ref().unwrap() {

src/ir/term/mod.rs

@@ -20,6 +20,7 @@
 //!    * [Computation]: a collection of variables and assertions about them
 //!    * [Value]: a variable-free (and evaluated) term
 //!
+#![allow(clippy::derive_ord_xor_partial_ord)]
 
 use circ_fields::{FieldT, FieldV};
 pub use circ_hc::{Node, Table, Weak};
@@ -795,7 +796,6 @@ impl Array {
 impl std::cmp::Eq for Value {}
 // We walk in danger here, intentionally. One day we may fix it.
 // FP is the heart of the problem.
-#[allow(clippy::derive_ord_xor_partial_ord)]
 impl std::cmp::Ord for Value {
     fn cmp(&self, o: &Self) -> std::cmp::Ordering {
         self.partial_cmp(o).expect("broken Value cmp")