reorganize crates into crates/ folder (#430)

cucapra · Mar 14, 2024 · eb63130 · eb63130
1 parent a2ad5b7
commit eb63130
Show file tree

Hide file tree

Showing 103 changed files with 51 additions and 53 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
-members = ["fil-derive", "fil-utils", "fil-ast", "fil-ir", "fil-gen"]
+members = ["crates/*"]
+resolver = "2"
 
 [workspace.package]
 authors = ["The Filament Team"]
@@ -31,11 +32,11 @@ lazy_static = "1.4"
 easy-smt = { version = "0.2.1" }
 struct-variant = "1.0"
 
-fil-utils = { version = "0.1.0", path = "fil-utils" }
-fil-ast = { version = "0.1.0", path = "fil-ast" }
-fil-ir = { version = "0.1.0", path = "fil-ir" }
-fil-derive = { version = "0.1.0", path = "fil-derive" }
-fil-gen = { version = "0.1.0", path = "fil-gen" }
+fil-utils = { version = "0.1.0", path = "crates/utils" }
+fil-ast = { version = "0.1.0", path = "crates/ast" }
+fil-ir = { version = "0.1.0", path = "crates/ir" }
+fil-derive = { version = "0.1.0", path = "crates/derive" }
+fil-gen = { version = "0.1.0", path = "crates/gen" }
 
 calyx-ir = { version = "0.7.1" }
 calyx-frontend = { version = "0.7.1" }
@@ -59,50 +60,3 @@ features = ["backends", "std", "inline-more"]
 [workspace.dependencies.bitvec]
 version = "1.0.1"
 features = ["alloc"]
-
-
-# ================= Package configuration ====================
-[package]
-name = "filament"
-version.workspace = true
-edition.workspace = true
-description.workspace = true
-authors.workspace = true
-license-file.workspace = true
-keywords.workspace = true
-repository.workspace = true
-homepage.workspace = true
-categories.workspace = true
-readme.workspace = true
-rust-version.workspace = true
-
-[dependencies]
-argh.workspace = true
-log.workspace = true
-pest.workspace = true
-pest_consume.workspace = true
-pest_derive.workspace = true
-linked_hash_set.workspace = true
-itertools.workspace = true
-linked-hash-map.workspace = true
-derivative.workspace = true
-smallvec.workspace = true
-topological-sort.workspace = true
-atty.workspace = true
-lazy_static.workspace = true
-easy-smt.workspace = true
-struct-variant.workspace = true
-env_logger.workspace = true
-codespan-reporting.workspace = true
-bitvec.workspace = true
-string-interner.workspace = true
-fil-ast.workspace = true
-fil-ir.workspace = true
-fil-utils.workspace = true
-fil-gen.workspace = true
-
-calyx-ir.workspace = true
-calyx-frontend.workspace = true
-calyx-utils.workspace = true
-calyx-opt.workspace = true
-calyx-backend.workspace = true
diff --git a/fil-ast/Cargo.toml → crates/ast/Cargo.toml b/fil-ast/Cargo.toml → crates/ast/Cargo.toml
diff --git a/fil-ast/src/bind_map.rs → crates/ast/src/bind_map.rs b/fil-ast/src/bind_map.rs → crates/ast/src/bind_map.rs
diff --git a/fil-ast/src/component.rs → crates/ast/src/component.rs b/fil-ast/src/component.rs → crates/ast/src/component.rs
diff --git a/fil-ast/src/constraint.rs → crates/ast/src/constraint.rs b/fil-ast/src/constraint.rs → crates/ast/src/constraint.rs
diff --git a/fil-ast/src/control.rs → crates/ast/src/control.rs b/fil-ast/src/control.rs → crates/ast/src/control.rs
diff --git a/fil-ast/src/expr.rs → crates/ast/src/expr.rs b/fil-ast/src/expr.rs → crates/ast/src/expr.rs
diff --git a/fil-ast/src/implication.rs → crates/ast/src/implication.rs b/fil-ast/src/implication.rs → crates/ast/src/implication.rs
diff --git a/fil-ast/src/interval.rs → crates/ast/src/interval.rs b/fil-ast/src/interval.rs → crates/ast/src/interval.rs
diff --git a/fil-ast/src/lib.rs → crates/ast/src/lib.rs b/fil-ast/src/lib.rs → crates/ast/src/lib.rs
diff --git a/fil-ast/src/loc.rs → crates/ast/src/loc.rs b/fil-ast/src/loc.rs → crates/ast/src/loc.rs
diff --git a/fil-ast/src/parser.rs → crates/ast/src/parser.rs b/fil-ast/src/parser.rs → crates/ast/src/parser.rs
diff --git a/fil-ast/src/port.rs → crates/ast/src/port.rs b/fil-ast/src/port.rs → crates/ast/src/port.rs
diff --git a/fil-ast/src/signature.rs → crates/ast/src/signature.rs b/fil-ast/src/signature.rs → crates/ast/src/signature.rs
diff --git a/fil-ast/src/syntax.pest → crates/ast/src/syntax.pest b/fil-ast/src/syntax.pest → crates/ast/src/syntax.pest
diff --git a/fil-ast/src/time.rs → crates/ast/src/time.rs b/fil-ast/src/time.rs → crates/ast/src/time.rs
diff --git a/fil-derive/Cargo.toml → crates/derive/Cargo.toml b/fil-derive/Cargo.toml → crates/derive/Cargo.toml
diff --git a/fil-derive/src/lib.rs → crates/derive/src/lib.rs b/fil-derive/src/lib.rs → crates/derive/src/lib.rs
diff --git a/crates/filament/Cargo.toml b/crates/filament/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "filament"
+version.workspace = true
+edition.workspace = true
+description.workspace = true
+authors.workspace = true
+license-file.workspace = true
+keywords.workspace = true
+repository.workspace = true
+homepage.workspace = true
+categories.workspace = true
+readme.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+argh.workspace = true
+log.workspace = true
+pest.workspace = true
+pest_consume.workspace = true
+pest_derive.workspace = true
+linked_hash_set.workspace = true
+itertools.workspace = true
+linked-hash-map.workspace = true
+derivative.workspace = true
+smallvec.workspace = true
+topological-sort.workspace = true
+atty.workspace = true
+lazy_static.workspace = true
+easy-smt.workspace = true
+struct-variant.workspace = true
+env_logger.workspace = true
+codespan-reporting.workspace = true
+bitvec.workspace = true
+string-interner.workspace = true
+fil-ast.workspace = true
+fil-ir.workspace = true
+fil-utils.workspace = true
+fil-gen.workspace = true
+
+calyx-ir.workspace = true
+calyx-frontend.workspace = true
+calyx-utils.workspace = true
+calyx-opt.workspace = true
+calyx-backend.workspace = true
diff --git a/src/cmdline.rs → crates/filament/src/cmdline.rs b/src/cmdline.rs → crates/filament/src/cmdline.rs
diff --git a/src/ir_passes/assignment_check.rs → ...ilament/src/ir_passes/assignment_check.rs b/src/ir_passes/assignment_check.rs → ...ilament/src/ir_passes/assignment_check.rs
diff --git a/src/ir_passes/assume.rs → crates/filament/src/ir_passes/assume.rs b/src/ir_passes/assume.rs → crates/filament/src/ir_passes/assume.rs
diff --git a/src/ir_passes/build_domination.rs → ...ilament/src/ir_passes/build_domination.rs b/src/ir_passes/build_domination.rs → ...ilament/src/ir_passes/build_domination.rs
diff --git a/src/ir_passes/bundle_elim.rs → crates/filament/src/ir_passes/bundle_elim.rs b/src/ir_passes/bundle_elim.rs → crates/filament/src/ir_passes/bundle_elim.rs
diff --git a/src/ir_passes/discharge.rs → crates/filament/src/ir_passes/discharge.rs b/src/ir_passes/discharge.rs → crates/filament/src/ir_passes/discharge.rs
diff --git a/src/ir_passes/dump_interface.rs → .../filament/src/ir_passes/dump_interface.rs b/src/ir_passes/dump_interface.rs → .../filament/src/ir_passes/dump_interface.rs
diff --git a/src/ir_passes/interval_check.rs → .../filament/src/ir_passes/interval_check.rs b/src/ir_passes/interval_check.rs → .../filament/src/ir_passes/interval_check.rs
diff --git a/src/ir_passes/lower/build_ctx.rs → ...filament/src/ir_passes/lower/build_ctx.rs b/src/ir_passes/lower/build_ctx.rs → ...filament/src/ir_passes/lower/build_ctx.rs
diff --git a/src/ir_passes/lower/compile.rs → ...s/filament/src/ir_passes/lower/compile.rs b/src/ir_passes/lower/compile.rs → ...s/filament/src/ir_passes/lower/compile.rs
diff --git a/src/ir_passes/lower/fsm.rs → crates/filament/src/ir_passes/lower/fsm.rs b/src/ir_passes/lower/fsm.rs → crates/filament/src/ir_passes/lower/fsm.rs
diff --git a/src/ir_passes/lower/mod.rs → crates/filament/src/ir_passes/lower/mod.rs b/src/ir_passes/lower/mod.rs → crates/filament/src/ir_passes/lower/mod.rs
diff --git a/src/ir_passes/lower/utils.rs → crates/filament/src/ir_passes/lower/utils.rs b/src/ir_passes/lower/utils.rs → crates/filament/src/ir_passes/lower/utils.rs
diff --git a/src/ir_passes/mod.rs → crates/filament/src/ir_passes/mod.rs b/src/ir_passes/mod.rs → crates/filament/src/ir_passes/mod.rs
diff --git a/src/ir_passes/mono/global.rs → crates/filament/src/ir_passes/mono/global.rs b/src/ir_passes/mono/global.rs → crates/filament/src/ir_passes/mono/global.rs
diff --git a/src/ir_passes/mono/mod.rs → crates/filament/src/ir_passes/mono/mod.rs b/src/ir_passes/mono/mod.rs → crates/filament/src/ir_passes/mono/mod.rs
diff --git a/src/ir_passes/mono/monodeferred.rs → ...lament/src/ir_passes/mono/monodeferred.rs b/src/ir_passes/mono/monodeferred.rs → ...lament/src/ir_passes/mono/monodeferred.rs
diff --git a/src/ir_passes/mono/monomorphize.rs → ...lament/src/ir_passes/mono/monomorphize.rs b/src/ir_passes/mono/monomorphize.rs → ...lament/src/ir_passes/mono/monomorphize.rs
diff --git a/src/ir_passes/mono/monosig.rs → ...es/filament/src/ir_passes/mono/monosig.rs b/src/ir_passes/mono/monosig.rs → ...es/filament/src/ir_passes/mono/monosig.rs
diff --git a/src/ir_passes/mono/utils/base.rs → ...filament/src/ir_passes/mono/utils/base.rs b/src/ir_passes/mono/utils/base.rs → ...filament/src/ir_passes/mono/utils/base.rs
diff --git a/src/ir_passes/mono/utils/comp.rs → ...filament/src/ir_passes/mono/utils/comp.rs b/src/ir_passes/mono/utils/comp.rs → ...filament/src/ir_passes/mono/utils/comp.rs
diff --git a/src/ir_passes/mono/utils/mod.rs → .../filament/src/ir_passes/mono/utils/mod.rs b/src/ir_passes/mono/utils/mod.rs → .../filament/src/ir_passes/mono/utils/mod.rs
diff --git a/src/ir_passes/mono/utils/underlying.rs → ...nt/src/ir_passes/mono/utils/underlying.rs b/src/ir_passes/mono/utils/underlying.rs → ...nt/src/ir_passes/mono/utils/underlying.rs
diff --git a/src/ir_passes/phantom_check.rs → ...s/filament/src/ir_passes/phantom_check.rs b/src/ir_passes/phantom_check.rs → ...s/filament/src/ir_passes/phantom_check.rs
diff --git a/src/ir_passes/prop_simplify.rs → ...s/filament/src/ir_passes/prop_simplify.rs b/src/ir_passes/prop_simplify.rs → ...s/filament/src/ir_passes/prop_simplify.rs
diff --git a/src/ir_passes/type_check.rs → crates/filament/src/ir_passes/type_check.rs b/src/ir_passes/type_check.rs → crates/filament/src/ir_passes/type_check.rs
diff --git a/src/ir_visitor/mod.rs → crates/filament/src/ir_visitor/mod.rs b/src/ir_visitor/mod.rs → crates/filament/src/ir_visitor/mod.rs
diff --git a/src/ir_visitor/visitor.rs → crates/filament/src/ir_visitor/visitor.rs b/src/ir_visitor/visitor.rs → crates/filament/src/ir_visitor/visitor.rs
diff --git a/src/lib.rs → crates/filament/src/lib.rs b/src/lib.rs → crates/filament/src/lib.rs
diff --git a/src/macros.rs → crates/filament/src/macros.rs b/src/macros.rs → crates/filament/src/macros.rs
diff --git a/src/main.rs → crates/filament/src/main.rs b/src/main.rs → crates/filament/src/main.rs
diff --git a/src/resolver.rs → crates/filament/src/resolver.rs b/src/resolver.rs → crates/filament/src/resolver.rs
diff --git a/src/utils/hoist_facts.rs → crates/filament/src/utils/hoist_facts.rs b/src/utils/hoist_facts.rs → crates/filament/src/utils/hoist_facts.rs
diff --git a/src/utils/mod.rs → crates/filament/src/utils/mod.rs b/src/utils/mod.rs → crates/filament/src/utils/mod.rs
diff --git a/fil-gen/Cargo.toml → crates/gen/Cargo.toml b/fil-gen/Cargo.toml → crates/gen/Cargo.toml
diff --git a/fil-gen/src/cmdline.rs → crates/gen/src/cmdline.rs b/fil-gen/src/cmdline.rs → crates/gen/src/cmdline.rs
diff --git a/fil-gen/src/exec.rs → crates/gen/src/exec.rs b/fil-gen/src/exec.rs → crates/gen/src/exec.rs
diff --git a/fil-gen/src/lib.rs → crates/gen/src/lib.rs b/fil-gen/src/lib.rs → crates/gen/src/lib.rs
diff --git a/fil-gen/src/main.rs → crates/gen/src/main.rs b/fil-gen/src/main.rs → crates/gen/src/main.rs
diff --git a/fil-gen/src/tool_schema.rs → crates/gen/src/tool_schema.rs b/fil-gen/src/tool_schema.rs → crates/gen/src/tool_schema.rs
diff --git a/fil-ir/Cargo.toml → crates/ir/Cargo.toml b/fil-ir/Cargo.toml → crates/ir/Cargo.toml
diff --git a/fil-ir/src/comp.rs → crates/ir/src/comp.rs b/fil-ir/src/comp.rs → crates/ir/src/comp.rs
diff --git a/fil-ir/src/context.rs → crates/ir/src/context.rs b/fil-ir/src/context.rs → crates/ir/src/context.rs
diff --git a/fil-ir/src/control.rs → crates/ir/src/control.rs b/fil-ir/src/control.rs → crates/ir/src/control.rs
diff --git a/fil-ir/src/ctx.rs → crates/ir/src/ctx.rs b/fil-ir/src/ctx.rs → crates/ir/src/ctx.rs
diff --git a/fil-ir/src/expr.rs → crates/ir/src/expr.rs b/fil-ir/src/expr.rs → crates/ir/src/expr.rs
diff --git a/fil-ir/src/fact.rs → crates/ir/src/fact.rs b/fil-ir/src/fact.rs → crates/ir/src/fact.rs
diff --git a/fil-ir/src/from_ast/astconv.rs → crates/ir/src/from_ast/astconv.rs b/fil-ir/src/from_ast/astconv.rs → crates/ir/src/from_ast/astconv.rs
diff --git a/fil-ir/src/from_ast/build_ctx.rs → crates/ir/src/from_ast/build_ctx.rs b/fil-ir/src/from_ast/build_ctx.rs → crates/ir/src/from_ast/build_ctx.rs
diff --git a/fil-ir/src/from_ast/mod.rs → crates/ir/src/from_ast/mod.rs b/fil-ir/src/from_ast/mod.rs → crates/ir/src/from_ast/mod.rs
diff --git a/fil-ir/src/from_ast/scope_map.rs → crates/ir/src/from_ast/scope_map.rs b/fil-ir/src/from_ast/scope_map.rs → crates/ir/src/from_ast/scope_map.rs
diff --git a/fil-ir/src/from_ast/sig_map.rs → crates/ir/src/from_ast/sig_map.rs b/fil-ir/src/from_ast/sig_map.rs → crates/ir/src/from_ast/sig_map.rs
diff --git a/fil-ir/src/idxs.rs → crates/ir/src/idxs.rs b/fil-ir/src/idxs.rs → crates/ir/src/idxs.rs
diff --git a/fil-ir/src/info.rs → crates/ir/src/info.rs b/fil-ir/src/info.rs → crates/ir/src/info.rs
diff --git a/fil-ir/src/lib.rs → crates/ir/src/lib.rs b/fil-ir/src/lib.rs → crates/ir/src/lib.rs
diff --git a/fil-ir/src/macros.rs → crates/ir/src/macros.rs b/fil-ir/src/macros.rs → crates/ir/src/macros.rs
diff --git a/fil-ir/src/printer/comp.rs → crates/ir/src/printer/comp.rs b/fil-ir/src/printer/comp.rs → crates/ir/src/printer/comp.rs
diff --git a/fil-ir/src/printer/display_ctx.rs → crates/ir/src/printer/display_ctx.rs b/fil-ir/src/printer/display_ctx.rs → crates/ir/src/printer/display_ctx.rs
diff --git a/fil-ir/src/printer/expr.rs → crates/ir/src/printer/expr.rs b/fil-ir/src/printer/expr.rs → crates/ir/src/printer/expr.rs
diff --git a/fil-ir/src/printer/mod.rs → crates/ir/src/printer/mod.rs b/fil-ir/src/printer/mod.rs → crates/ir/src/printer/mod.rs
diff --git a/fil-ir/src/printer/prop.rs → crates/ir/src/printer/prop.rs b/fil-ir/src/printer/prop.rs → crates/ir/src/printer/prop.rs
diff --git a/fil-ir/src/source_info.rs → crates/ir/src/source_info.rs b/fil-ir/src/source_info.rs → crates/ir/src/source_info.rs
diff --git a/fil-ir/src/structure.rs → crates/ir/src/structure.rs b/fil-ir/src/structure.rs → crates/ir/src/structure.rs
diff --git a/fil-ir/src/time.rs → crates/ir/src/time.rs b/fil-ir/src/time.rs → crates/ir/src/time.rs
diff --git a/fil-ir/src/utils/dense_info.rs → crates/ir/src/utils/dense_info.rs b/fil-ir/src/utils/dense_info.rs → crates/ir/src/utils/dense_info.rs
diff --git a/fil-ir/src/utils/foreign.rs → crates/ir/src/utils/foreign.rs b/fil-ir/src/utils/foreign.rs → crates/ir/src/utils/foreign.rs
diff --git a/fil-ir/src/utils/idx.rs → crates/ir/src/utils/idx.rs b/fil-ir/src/utils/idx.rs → crates/ir/src/utils/idx.rs
diff --git a/fil-ir/src/utils/index_store.rs → crates/ir/src/utils/index_store.rs b/fil-ir/src/utils/index_store.rs → crates/ir/src/utils/index_store.rs
diff --git a/fil-ir/src/utils/interned.rs → crates/ir/src/utils/interned.rs b/fil-ir/src/utils/interned.rs → crates/ir/src/utils/interned.rs
diff --git a/fil-ir/src/utils/mod.rs → crates/ir/src/utils/mod.rs b/fil-ir/src/utils/mod.rs → crates/ir/src/utils/mod.rs
diff --git a/fil-ir/src/utils/sparse_info.rs → crates/ir/src/utils/sparse_info.rs b/fil-ir/src/utils/sparse_info.rs → crates/ir/src/utils/sparse_info.rs
diff --git a/fil-ir/src/utils/subst.rs → crates/ir/src/utils/subst.rs b/fil-ir/src/utils/subst.rs → crates/ir/src/utils/subst.rs
diff --git a/fil-ir/src/utils/traversal.rs → crates/ir/src/utils/traversal.rs b/fil-ir/src/utils/traversal.rs → crates/ir/src/utils/traversal.rs
diff --git a/fil-ir/src/validate.rs → crates/ir/src/validate.rs b/fil-ir/src/validate.rs → crates/ir/src/validate.rs
diff --git a/fil-utils/Cargo.toml → crates/utils/Cargo.toml b/fil-utils/Cargo.toml → crates/utils/Cargo.toml
diff --git a/fil-utils/src/errors.rs → crates/utils/src/errors.rs b/fil-utils/src/errors.rs → crates/utils/src/errors.rs
diff --git a/fil-utils/src/global_sym.rs → crates/utils/src/global_sym.rs b/fil-utils/src/global_sym.rs → crates/utils/src/global_sym.rs
diff --git a/fil-utils/src/gsym.rs → crates/utils/src/gsym.rs b/fil-utils/src/gsym.rs → crates/utils/src/gsym.rs
diff --git a/fil-utils/src/id.rs → crates/utils/src/id.rs b/fil-utils/src/id.rs → crates/utils/src/id.rs
diff --git a/fil-utils/src/lib.rs → crates/utils/src/lib.rs b/fil-utils/src/lib.rs → crates/utils/src/lib.rs
diff --git a/fil-utils/src/math.rs → crates/utils/src/math.rs b/fil-utils/src/math.rs → crates/utils/src/math.rs
diff --git a/fil-utils/src/namegenerator.rs → crates/utils/src/namegenerator.rs b/fil-utils/src/namegenerator.rs → crates/utils/src/namegenerator.rs
diff --git a/fil-utils/src/position.rs → crates/utils/src/position.rs b/fil-utils/src/position.rs → crates/utils/src/position.rs
diff --git a/fil-utils/src/reporter.rs → crates/utils/src/reporter.rs b/fil-utils/src/reporter.rs → crates/utils/src/reporter.rs