Use map instead of and_then

Clippy emits a couple of warnings of the form:

  warning: using `Option.and_then(|x| Some(y))`, which is more
  succinctly expressed as `map(|x| y)`

As suggested, use `map` instead of `and_then`

Author: tcharding

src/miniscript/astelem.rs

@@ -200,10 +200,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Terminal<Pk, Ctx> {
             Terminal::Thresh(k, ref subs) => {
                 let subs: Result<Vec<Arc<Miniscript<Q, _>>>, _> = subs
                     .iter()
-                    .map(|s| {
-                        s.real_translate_pk(&mut *fpk, &mut *fpkh)
-                            .and_then(|x| Ok(Arc::new(x)))
-                    })
+                    .map(|s| s.real_translate_pk(&mut *fpk, &mut *fpkh).map(Arc::new))
                     .collect();
                 Terminal::Thresh(k, subs?)
             }

src/miniscript/types/extra_props.rs

@@ -686,8 +686,8 @@ impl Property for ExtData {
                 (None, None) => None,
             },
             max_sat_size: cmp::max(
-                l.max_sat_size.and_then(|(w, s)| Some((w + 2, s + 1))),
-                r.max_sat_size.and_then(|(w, s)| Some((w + 1, s + 1))),
+                l.max_sat_size.map(|(w, s)| (w + 2, s + 1)),
+                r.max_sat_size.map(|(w, s)| (w + 1, s + 1)),
             ),
             max_dissat_size: match (l.max_dissat_size, r.max_dissat_size) {
                 (Some(l), Some(r)) => {