Merge #49: patch elements-miniscript for rustc recursion bug

6c9e8ab ci: pin some more deps for 1.48.0 (Andrew Poelstra)
f551774 patch elements-miniscript for rustc recursion bug (Andrew Poelstra)

Pull request description:

  cc rust-lang/rust#110475

Top commit has no ACKs.

Tree-SHA512: 499db6a81ca0b48e921aac458b1d6e55022ac7c161e48a0b3e4ffeb97abb1983a7b25e7bb1cce459b568c0b9ee97b3b62321ce8e1aa2ac6e4edc56ad83302d99

contrib/test.sh

@@ -9,7 +9,14 @@ rustc --version
 
 # Pin dependencies required to build with Rust 1.48
 if cargo --version | grep "1\.48"; then
+    cargo update -p serde_json --precise 1.0.99
     cargo update -p serde --precise 1.0.156
+    cargo update -p once_cell --precise 1.13.1
+    cargo update -p regex --precise 1.7.0
+    # These two needed for serde_derive with 1.48.0, *in addition*
+    # to pinning serde itself above.
+    cargo update -p quote --precise 1.0.30
+    cargo update -p proc-macro2 --precise 1.0.65
 fi
 
 # Format if told to

src/policy/concrete.rs

@@ -662,6 +662,7 @@ impl<Pk: MiniscriptKey> ForEachKey<Pk> for Policy<Pk> {
     where
         Pk: 'a,
     {
+        let mut pred = |x| pred(x);
         match *self {
             Policy::Unsatisfiable | Policy::Trivial => true,
             Policy::Key(ref pk) => pred(pk),

src/policy/semantic.rs

@@ -64,6 +64,7 @@ impl<Pk: MiniscriptKey> ForEachKey<Pk> for Policy<Pk> {
     where
         Pk: 'a,
     {
+        let mut pred = |x| pred(x);
         match *self {
             Policy::Unsatisfiable | Policy::Trivial => true,
             Policy::Key(ref _pkh) => todo!("Semantic Policy KeyHash must store Pk"),