Merge BlockstreamResearch#214: Fix AMR

32d30e4 Clippy: Simplify Literal variant (Christian Lewe)
d9e0ad7 Clippy: Fix (Christian Lewe)
3611825 Clippy: Ignore lint that makes code less readable (Christian Lewe)
88ac7b9 Fix AMR computation (Christian Lewe)

Pull request description:

  Fix an error that was introduced in BlockstreamResearch#212. Fix clippy.

ACKs for top commit:
  apoelstra:
    ACK 32d30e4

Tree-SHA512: 4e3738d6f8be07f2b420ab84d913415071fb3afa4dfd3645f927eccb0c98487f7cd4143e16b9e4dd8b0d3855aa6cd6fc912c9b0f613a72a07b71990f8fc253a9

Author: apoelstra

simplicity-sys/src/alloc.rs

@@ -7,6 +7,7 @@ use std::mem;
 /// [16 bytes is the greatest alignment of any architecture Rust currently supports](https://github.com/rust-lang/rust/blob/61223975d46f794466efa832bc7562b9707ecc46/library/std/src/sys/pal/common/alloc.rs).
 #[repr(align(16))]
 #[derive(Default, Copy, Clone)]
+#[allow(dead_code)]
 pub struct AlignedType([u8; 16]);
 
 /// Minimal alignment which is valid for all C types.

src/human_encoding/parse/ast.rs

@@ -3,7 +3,6 @@
 //! Parsing
 
 use std::mem;
-use std::str::FromStr;
 use std::sync::Arc;
 
 use crate::human_encoding::{Error, ErrorSet, Position, WitnessOrHole};
@@ -61,7 +60,7 @@ pub enum ExprInner<J> {
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
 pub enum AstCmr<J> {
     Expr(Arc<Expression<J>>),
-    Literal(Cmr),
+    Literal,
 }
 
 /// A type, as represented in the AST
@@ -395,9 +394,7 @@ impl<J: Jet> Ast<J> {
         assert_eq!(lexemes.len(), 1);
         assert_eq!(lexemes[0].raw.len(), 65);
 
-        Ast::Cmr(AstCmr::Literal(
-            Cmr::from_str(&lexemes[0].raw[1..]).unwrap(),
-        ))
+        Ast::Cmr(AstCmr::Literal)
     }
 
     fn expect_arrow(&mut self) -> (Option<Type>, Option<Type>) {

src/human_encoding/parse/mod.rs

@@ -8,7 +8,6 @@ use crate::dag::{Dag, DagLike, InternalSharing};
 use crate::jet::Jet;
 use crate::node;
 use crate::types::Type;
-use crate::Cmr;
 use std::collections::HashMap;
 use std::mem;
 use std::sync::atomic::{AtomicUsize, Ordering};
@@ -139,7 +138,7 @@ struct ResolvedExpression<J: Jet> {
 
 enum ResolvedCmr<J: Jet> {
     Expr(Arc<ResolvedExpression<J>>),
-    Literal(Cmr),
+    Literal,
 }
 
 enum ResolvedInner<J: Jet> {
@@ -312,7 +311,7 @@ pub fn parse<J: Jet + 'static>(
                             right.in_degree.fetch_add(1, Ordering::SeqCst);
                             ResolvedCmr::Expr(right)
                         }
-                        ast::AstCmr::Literal(cmr) => ResolvedCmr::Literal(*cmr),
+                        ast::AstCmr::Literal => ResolvedCmr::Literal,
                     };
                     ResolvedInner::AssertL(left, right)
                 }
@@ -323,7 +322,7 @@ pub fn parse<J: Jet + 'static>(
                             left.in_degree.fetch_add(1, Ordering::SeqCst);
                             ResolvedCmr::Expr(left)
                         }
-                        ast::AstCmr::Literal(cmr) => ResolvedCmr::Literal(*cmr),
+                        ast::AstCmr::Literal => ResolvedCmr::Literal,
                     };
 
                     let right = inline_stack.pop().unwrap();
@@ -413,8 +412,8 @@ pub fn parse<J: Jet + 'static>(
                 | ResolvedInner::AssertR(ResolvedCmr::Expr(ref left), ref right) => {
                     Dag::Binary(left, right)
                 }
-                ResolvedInner::AssertL(ref child, ResolvedCmr::Literal(..))
-                | ResolvedInner::AssertR(ResolvedCmr::Literal(..), ref child) => Dag::Unary(child),
+                ResolvedInner::AssertL(ref child, ResolvedCmr::Literal)
+                | ResolvedInner::AssertR(ResolvedCmr::Literal, ref child) => Dag::Unary(child),
                 ResolvedInner::Inline(ref inner) => inner.as_dag().map(|node| node),
             }
         }
@@ -431,10 +430,10 @@ pub fn parse<J: Jet + 'static>(
         for data in expr.as_ref().post_order_iter::<InternalSharing>() {
             let left = data
                 .left_index
-                .and_then(|idx| converted[idx].as_ref().map(Arc::clone));
+                .and_then(|idx| Option::<Arc<_>>::clone(&converted[idx]));
             let right = data
                 .right_index
-                .and_then(|idx| converted[idx].as_ref().map(Arc::clone));
+                .and_then(|idx| Option::<Arc<_>>::clone(&converted[idx]));
 
             let maybe_inner = match data.node.inner {
                 ResolvedInner::Missing { ref name, .. } => {
@@ -482,11 +481,7 @@ pub fn parse<J: Jet + 'static>(
                 }
             };
 
-            let name = data
-                .node
-                .name
-                .as_ref()
-                .map(Arc::clone)
+            let name = Option::<Arc<str>>::clone(&data.node.name)
                 .unwrap_or_else(|| Arc::from(namer.assign_name(inner.as_ref()).as_str()));
 
             let node = NamedConstructNode::new(

src/lib.rs

@@ -4,7 +4,9 @@
     // we use `bool` to represent bits and frequentely assert_eq against them
     clippy::bool_assert_comparison,
     // we use () as the environment for Core (FIXME we should probabl use a newtype)
-    clippy::let_unit_value
+    clippy::let_unit_value,
+    // We write map(Arc::clone) to signify that a cheap Arc is being cloned
+    clippy::map_clone
 )]
 
 #[cfg(feature = "serde")]

src/merkle/amr.rs

@@ -65,7 +65,7 @@ impl Amr {
 
     /// Produce a CMR for a take combinator
     pub fn take(ty: &FinalArrow, child: Amr) -> Self {
-        let (a, b) = ty.source.as_sum().unwrap();
+        let (a, b) = ty.source.as_product().unwrap();
         let c = &ty.target;
         Self::TAKE_IV
             .update(a.tmr().into(), b.tmr().into())

src/node/witness.rs

@@ -59,7 +59,7 @@ impl<J: Jet> WitnessNode<J> {
                 .as_ref()
                 .map(Arc::clone)
                 .map_disconnect(Option::<Arc<_>>::clone)
-                .map_witness(|wit| wit.as_ref().map(Arc::clone)),
+                .map_witness(Option::<Arc<Value>>::clone),
         })
     }
 
@@ -83,7 +83,7 @@ impl<J: Jet> WitnessNode<J> {
                 _: &PostOrderIterItem<&WitnessNode<J>>,
                 wit: &Option<Arc<Value>>,
             ) -> Result<Option<Arc<Value>>, Self::Error> {
-                Ok(wit.as_ref().map(Arc::clone))
+                Ok(Option::<Arc<Value>>::clone(wit))
             }
 
             fn prune_case(
@@ -129,7 +129,7 @@ impl<J: Jet> WitnessNode<J> {
             ) -> Result<WitnessData<J>, Self::Error> {
                 let converted_inner = inner
                     .map(|node| node.cached_data())
-                    .map_witness(|wit| wit.as_ref().map(Arc::clone));
+                    .map_witness(Option::<Arc<Value>>::clone);
                 // This next line does the actual retyping.
                 let mut retyped = WitnessData::from_inner(converted_inner)?;
                 // Sometimes we set the prune bit on nodes without setting that