Rename semantic::Policy to Semantic

Rename the `semantic::Policy` to `semantic::Semantic`. Keep the
re-export at `Policy/mod.rs` (was an alias).

In the `semantic` module unit tests leave `StringPolicy` as it is.

Outside the `semantic` module remove the stutter; use `Semantic`
instead of `semantic::Semantic`.

Author: tcharding

src/descriptor/bare.rs

@@ -17,7 +17,7 @@ use crate::expression::{self, FromTree};
 use crate::miniscript::context::{ScriptContext, ScriptContextError};
 use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};
 use crate::plan::AssetProvider;
-use crate::policy::{semantic, Liftable};
+use crate::policy::{Liftable, Semantic};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
@@ -165,7 +165,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Bare<Pk> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Bare<Pk> {
-    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> { self.ms.lift() }
+    fn lift(&self) -> Result<Semantic<Pk>, Error> { self.ms.lift() }
 }
 
 impl<Pk: FromStrKey> FromTree for Bare<Pk> {
@@ -349,8 +349,8 @@ impl<Pk: MiniscriptKey> fmt::Display for Pkh<Pk> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Pkh<Pk> {
-    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
-        Ok(semantic::Policy::Key(self.pk.clone()))
+    fn lift(&self) -> Result<Semantic<Pk>, Error> {
+        Ok(Semantic::Key(self.pk.clone()))
     }
 }
 

src/descriptor/segwitv0.rs

@@ -16,7 +16,7 @@ use crate::miniscript::context::{ScriptContext, ScriptContextError};
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
 use crate::miniscript::satisfy::{Placeholder, Satisfaction, Witness};
 use crate::plan::AssetProvider;
-use crate::policy::{semantic, Liftable};
+use crate::policy::{Liftable, Semantic};
 use crate::prelude::*;
 use crate::util::varint_len;
 use crate::{
@@ -182,7 +182,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Wsh<Pk> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Wsh<Pk> {
-    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> { self.ms.lift() }
+    fn lift(&self) -> Result<Semantic<Pk>, Error> { self.ms.lift() }
 }
 
 impl<Pk: FromStrKey> crate::expression::FromTree for Wsh<Pk> {
@@ -394,8 +394,8 @@ impl<Pk: MiniscriptKey> fmt::Display for Wpkh<Pk> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Wpkh<Pk> {
-    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
-        Ok(semantic::Policy::Key(self.pk.clone()))
+    fn lift(&self) -> Result<Semantic<Pk>, Error> {
+        Ok(Semantic::Key(self.pk.clone()))
     }
 }
 

src/descriptor/sh.rs

@@ -20,7 +20,7 @@ use crate::miniscript::context::ScriptContext;
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
 use crate::miniscript::satisfy::{Placeholder, Satisfaction};
 use crate::plan::AssetProvider;
-use crate::policy::{semantic, Liftable};
+use crate::policy::{Liftable, Semantic};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_to_scriptsig};
 use crate::{
@@ -47,10 +47,10 @@ pub enum ShInner<Pk: MiniscriptKey> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Sh<Pk> {
-    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
+    fn lift(&self) -> Result<Semantic<Pk>, Error> {
         match self.inner {
             ShInner::Wsh(ref wsh) => wsh.lift(),
-            ShInner::Wpkh(ref pk) => Ok(semantic::Policy::Key(pk.as_inner().clone())),
+            ShInner::Wpkh(ref pk) => Ok(Semantic::Key(pk.as_inner().clone())),
             ShInner::Ms(ref ms) => ms.lift(),
         }
     }

src/descriptor/tr/mod.rs

@@ -11,8 +11,7 @@ use crate::expression::{self, FromTree};
 use crate::miniscript::satisfy::{Placeholder, Satisfaction, SchnorrSigType, Witness};
 use crate::miniscript::Miniscript;
 use crate::plan::AssetProvider;
-use crate::policy::semantic::Policy;
-use crate::policy::Liftable;
+use crate::policy::{Liftable, Semantic};
 use crate::prelude::*;
 use crate::util::{varint_len, witness_size};
 use crate::{
@@ -418,13 +417,13 @@ impl<Pk: MiniscriptKey> fmt::Display for Tr<Pk> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Tr<Pk> {
-    fn lift(&self) -> Result<Policy<Pk>, Error> {
+    fn lift(&self) -> Result<Semantic<Pk>, Error> {
         match &self.tree {
-            Some(root) => Ok(Policy::Thresh(Threshold::or(
-                Arc::new(Policy::Key(self.internal_key.clone())),
+            Some(root) => Ok(Semantic::Thresh(Threshold::or(
+                Arc::new(Semantic::Key(self.internal_key.clone())),
                 Arc::new(root.lift()?),
             ))),
-            None => Ok(Policy::Key(self.internal_key.clone())),
+            None => Ok(Semantic::Key(self.internal_key.clone())),
         }
     }
 }

src/policy/mod.rs

@@ -19,7 +19,7 @@ pub mod concrete;
 pub mod semantic;
 
 pub use self::concrete::Policy as Concrete;
-pub use self::semantic::Policy as Semantic;
+pub use self::semantic::Semantic;
 use crate::descriptor::Descriptor;
 use crate::iter::TreeLike as _;
 use crate::miniscript::{Miniscript, ScriptContext};