revert some moves

Author: ss2165

hugr-core/src/envelope.rs

@@ -63,7 +63,30 @@ use itertools::Itertools as _;
 
 use crate::import::ImportError;
 
-pub use description::{GENERATOR_KEY, USED_EXTENSIONS_KEY};
+// TODO centralise all core metadata keys in one place.
+
+/// Key used to store the name of the generator that produced the envelope.
+pub const GENERATOR_KEY: &str = "core.generator";
+/// Key used to store the list of used extensions in the metadata of a HUGR.
+pub const USED_EXTENSIONS_KEY: &str = "core.used_extensions";
+
+/// Get the name of the generator from the metadata of the HUGR modules.
+///
+/// If multiple modules have different generators, a comma-separated list is returned in
+/// module order.
+/// If no generator is found, `None` is returned.
+pub fn get_generator<H: HugrView>(modules: &[H]) -> Option<String> {
+    let generators: Vec<String> = modules
+        .iter()
+        .filter_map(|hugr| hugr.get_metadata(hugr.module_root(), GENERATOR_KEY))
+        .map(format_generator)
+        .collect();
+    if generators.is_empty() {
+        return None;
+    }
+
+    Some(generators.join(", "))
+}
 
 /// Format a generator value from the metadata.
 pub fn format_generator(json_val: &serde_json::Value) -> String {
@@ -96,24 +119,6 @@ fn gen_str(generator: Option<&String>) -> String {
     }
 }
 
-/// Get the name of the generator from the metadata of the HUGR modules.
-///
-/// If multiple modules have different generators, a comma-separated list is returned in
-/// module order.
-/// If no generator is found, `None` is returned.
-pub fn get_generator<H: HugrView>(modules: &[H]) -> Option<String> {
-    let generators: Vec<String> = modules
-        .iter()
-        .filter_map(|hugr| hugr.get_metadata(hugr.module_root(), GENERATOR_KEY))
-        .map(format_generator)
-        .collect();
-    if generators.is_empty() {
-        return None;
-    }
-
-    Some(generators.join(", "))
-}
-
 /// Wrap an error with a generator string.
 #[derive(Error, Debug)]
 #[deprecated(since = "0.24.1", note = "Use PackageDesc instead")]

hugr-core/src/envelope/description.rs

@@ -3,7 +3,7 @@ use semver::Version;
 
 use crate::{
     HugrView, Node,
-    envelope::EnvelopeHeader,
+    envelope::{EnvelopeHeader, USED_EXTENSIONS_KEY},
     ops::{DataflowOpTrait, OpType},
 };
 
@@ -343,13 +343,6 @@ impl<H: HugrView<Node = Node>> From<&H> for ModuleDesc {
     }
 }
 
-// TODO centralise all core metadata keys in one place.
-
-/// Key used to store the name of the generator that produced the envelope.
-pub const GENERATOR_KEY: &str = "core.generator";
-/// Key used to store the list of used extensions in the metadata of a HUGR.
-pub const USED_EXTENSIONS_KEY: &str = "core.used_extensions";
-
 #[cfg(test)]
 mod test {
     use super::*;