move prelude to util (#138)

HigherOrderCO · May 29, 2024 · e92aec5 · e92aec5
1 parent 103effc
commit e92aec5
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 49 deletions.
diff --git a/ast/src/ast.rs b/ast/src/ast.rs
@@ -11,15 +11,12 @@
 //! [interaction calculus]: https://en.wikipedia.org/wiki/Interaction_nets#Interaction_calculus
 #![cfg_attr(not(feature = "std"), no_std)]
 
-include!("../../prelude.rs");
-
 #[cfg(feature = "parser")]
 mod parser;
 
 use alloc::collections::BTreeMap;
 
-use crate::prelude::*;
-use hvm64_util::{create_var, deref_to, maybe_grow, multi_iterator, ops::TypedOp as Op, var_to_num};
+use hvm64_util::{create_var, deref_to, maybe_grow, multi_iterator, ops::TypedOp as Op, prelude::*, var_to_num};
 
 use ordered_float::OrderedFloat;
 

diff --git a/ast/src/parser.rs b/ast/src/parser.rs
@@ -1,4 +1,4 @@
-use crate::prelude::*;
+use hvm64_util::prelude::*;
 
 use alloc::collections::BTreeMap;
 use core::str::FromStr;

diff --git a/host/src/encode.rs b/host/src/encode.rs
@@ -1,4 +1,4 @@
-use crate::prelude::*;
+use hvm64_util::prelude::*;
 
 use crate::Host;
 use hvm64_ast::{Lab, Net as AstNet, Tree};

diff --git a/host/src/host.rs b/host/src/host.rs
@@ -2,11 +2,9 @@
 //! the runtime.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-include!("../../prelude.rs");
-
-use crate::prelude::*;
 use hvm64_ast::{Book, Tree};
 use hvm64_runtime::{Addr, Def, DynDef, InterpretedDef, LabSet, Port, Tag, Wire};
+use hvm64_util::prelude::*;
 
 mod calc_labels;
 mod encode;

diff --git a/host/src/readback.rs b/host/src/readback.rs
@@ -1,4 +1,4 @@
-use crate::prelude::*;
+use hvm64_util::prelude::*;
 
 use super::{Addr, Host, Port, Tag, Wire};
 

diff --git a/prelude.rs b/prelude.rs
diff --git a/runtime/src/parallel.rs b/runtime/src/parallel.rs
@@ -2,7 +2,7 @@
 
 use std::{sync::Barrier, thread};
 
-use ::alloc::sync::Arc;
+use alloc::sync::Arc;
 use atomic::AtomicUsize;
 
 use super::*;

diff --git a/runtime/src/runtime.rs b/runtime/src/runtime.rs
@@ -20,9 +20,7 @@
 #![cfg_attr(feature = "trace", feature(const_type_name))]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-include!("../../prelude.rs");
-
-use crate::prelude::*;
+use hvm64_util::prelude::*;
 
 pub use hvm64_util::ops;
 

diff --git a/runtime/src/trace.rs b/runtime/src/trace.rs
@@ -64,6 +64,8 @@
 #![allow(non_snake_case)]
 #![cfg_attr(not(feature = "trace"), allow(unused))]
 
+use hvm64_util::prelude::*;
+
 use core::{
   cell::UnsafeCell,
   fmt::{self, Debug, Formatter, Write},
@@ -73,7 +75,6 @@ use core::{
 #[cfg(feature = "std")]
 use std::sync::{Mutex, Once};
 
-use crate::prelude::*;
 use hvm64_util::ops::TypedOp as Op;
 
 use crate::{Addr, Port, Trg, Wire};

diff --git a/src/compile.rs b/src/compile.rs
@@ -6,9 +6,9 @@ use alloc::collections::{BTreeMap, BTreeSet};
 use core::{fmt::Write, hash::Hasher};
 use std::hash::DefaultHasher;
 
-use crate::prelude::*;
 use hvm64_host::Host;
 use hvm64_runtime::{Def, Instruction, InterpretedDef, LabSet, Port, Tag};
+use hvm64_util::prelude::*;
 
 struct DefInfo<'a> {
   rust_name: String,

diff --git a/src/compile/include_files.rs b/src/compile/include_files.rs
@@ -73,7 +73,6 @@ hvm64-runtime = { path = "../runtime", default-features = false }
   fs::write(".hvm/gen/src/lib.rs", lib)?;
 
   include_files! {
-    prelude
     crate util {
       lib
       bi_enum
@@ -87,6 +86,7 @@ hvm64-runtime = { path = "../runtime", default-features = false }
         word
       }
       parse_abbrev_number
+      prelude
       pretty_num
     }
     crate runtime {

diff --git a/src/main.rs b/src/main.rs
@@ -1,11 +1,9 @@
-include!("../prelude.rs");
-
 mod compile;
 
 mod args;
 mod full;
 
-use crate::prelude::*;
+use hvm64_util::prelude::*;
 
 use core::time::Duration;
 use std::{

diff --git a/transform/src/eta_reduce.rs b/transform/src/eta_reduce.rs
@@ -53,9 +53,10 @@
 //!
 //! The pass also reduces subnets such as `(* *) -> *`
 
+use hvm64_util::prelude::*;
+
 use core::ops::RangeFrom;
 
-use crate::prelude::*;
 use hvm64_ast::{Net, Tree};
 
 use ordered_float::OrderedFloat;

diff --git a/transform/src/inline.rs b/transform/src/inline.rs
@@ -1,6 +1,7 @@
+use hvm64_util::prelude::*;
+
 use core::ops::BitOr;
 
-use crate::prelude::*;
 use hvm64_ast::{Book, Net, Tree};
 use hvm64_util::maybe_grow;
 

diff --git a/transform/src/pre_reduce.rs b/transform/src/pre_reduce.rs
@@ -14,7 +14,8 @@
 //! At the end, each mutated [`ast::Net`] is placed into the [`Book`],
 //! overriding the previous one.
 
-use crate::prelude::*;
+use hvm64_util::prelude::*;
+
 use hvm64_ast::{Book, Tree};
 use hvm64_host::Host;
 use hvm64_runtime::{AsDef, Def, Heap, InterpretedDef, LabSet, Port, Rewrites};

diff --git a/transform/src/prune.rs b/transform/src/prune.rs
@@ -1,4 +1,5 @@
-use crate::prelude::*;
+use hvm64_util::prelude::*;
+
 use hvm64_ast::{Book, Tree};
 use hvm64_util::maybe_grow;
 

diff --git a/transform/src/transform.rs b/transform/src/transform.rs
@@ -1,8 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-include!("../../prelude.rs");
-
-use crate::prelude::*;
+use hvm64_util::prelude::*;
 
 use hvm64_ast::Book;
 

diff --git a/util/src/bi_enum.rs b/util/src/bi_enum.rs
@@ -54,6 +54,7 @@ macro_rules! bi_enum {
 
 #[test]
 fn test_bi_enum() {
+  use crate::prelude::*;
   use alloc::string::ToString;
   use core::str::FromStr;
 

diff --git a/util/src/lib.rs b/util/src/lib.rs
@@ -1,6 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-include!("../../prelude.rs");
+pub mod prelude;
 
 pub mod ops;
 

diff --git a/util/src/prelude.rs b/util/src/prelude.rs
@@ -0,0 +1,18 @@
+pub extern crate alloc;
+
+pub use alloc::{
+  borrow::ToOwned,
+  boxed::Box,
+  format,
+  string::{String, ToString},
+  vec,
+  vec::Vec,
+};
+
+pub use core::{fmt, hint, iter, mem, ptr};
+
+#[cfg(feature = "std")]
+pub use std::collections::{hash_map::Entry, HashMap as Map, HashSet as Set};
+
+#[cfg(not(feature = "std"))]
+pub use alloc::collections::{btree_map::Entry, BTreeMap as Map, BTreeSet as Set};