chore(zink): sort packages

zink-lang · Oct 25, 2023 · 2123154 · 2123154
1 parent c89937a
commit 2123154
Show file tree

Hide file tree

Showing 40 changed files with 22 additions and 11 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,14 +1,14 @@
 [workspace]
 members = [
+  "abi",
   "cli",
+  "cli/conta",
+  "cli/elko",
   "codegen",
+  "codegen/opcodes",
   "compiler",
-  "crates/abi",
-  "crates/codegen",
-  "crates/opcodes",
-  "crates/zint",
-  "utils/conta",
-  "utils/elko",
+  "zink/codegen",
+  "zint",
 ]
 resolver = "2"
 
@@ -52,15 +52,15 @@ wasm-opt = "0.113.0"
 wasmparser = "0.107.0"
 wat = "1.0.75"
 
-elko = { path = "utils/elko", version = "=0.1.4" }
-opcodes = { package = "evm-opcodes", path = "crates/opcodes", version = "=0.0.3", features = ["data"] }
-zabi = { path = "crates/abi", version = "=0.1.4" }
+elko = { path = "cli/elko", version = "=0.1.4" }
+opcodes = { package = "evm-opcodes", path = "codegen/opcodes", version = "=0.0.3", features = ["data"] }
+zabi = { path = "abi", version = "=0.1.4" }
 zinkup = { path = "cli", version = "=0.1.4" }
 zingen =  { path = "codegen", version = "=0.1.4" }
 zinkc = { path = "compiler", version = "=0.1.4" }
 zink = { path = ".", version = "=0.1.4" }
-zink-codegen = { path = "crates/codegen", version = "=0.1.4" }
-zint = { path = "crates/zint", version = "=0.1.4" }
+zink-codegen = { path = "zink/codegen", version = "=0.1.4" }
+zint = { path = "zint", version = "=0.1.4" }
 
 [profile]
 dev = { panic = "abort"}
@@ -79,6 +79,10 @@ edition.workspace = true
 license.workspace = true
 homepage.workspace = true
 repository.workspace = true
+readme = "zink/README.md"
+
+[lib]
+path = "zink/src/lib.rs"
 
 [dependencies]
 zink-codegen.workspace = true
diff --git a/crates/abi/Cargo.toml → abi/Cargo.toml b/crates/abi/Cargo.toml → abi/Cargo.toml
diff --git a/crates/abi/src/lib.rs → abi/src/lib.rs b/crates/abi/src/lib.rs → abi/src/lib.rs
diff --git a/crates/abi/src/result.rs → abi/src/result.rs b/crates/abi/src/result.rs → abi/src/result.rs
diff --git a/utils/conta/Cargo.toml → cli/conta/Cargo.toml b/utils/conta/Cargo.toml → cli/conta/Cargo.toml
diff --git a/utils/conta/README.md → cli/conta/README.md b/utils/conta/README.md → cli/conta/README.md
diff --git a/utils/conta/bin/conta.rs → cli/conta/bin/conta.rs b/utils/conta/bin/conta.rs → cli/conta/bin/conta.rs
diff --git a/utils/conta/src/cmd/bump.rs → cli/conta/src/cmd/bump.rs b/utils/conta/src/cmd/bump.rs → cli/conta/src/cmd/bump.rs
diff --git a/utils/conta/src/cmd/mod.rs → cli/conta/src/cmd/mod.rs b/utils/conta/src/cmd/mod.rs → cli/conta/src/cmd/mod.rs
diff --git a/utils/conta/src/cmd/publish.rs → cli/conta/src/cmd/publish.rs b/utils/conta/src/cmd/publish.rs → cli/conta/src/cmd/publish.rs
diff --git a/utils/conta/src/config.rs → cli/conta/src/config.rs b/utils/conta/src/config.rs → cli/conta/src/config.rs
diff --git a/utils/conta/src/lib.rs → cli/conta/src/lib.rs b/utils/conta/src/lib.rs → cli/conta/src/lib.rs
diff --git a/utils/conta/src/sed.rs → cli/conta/src/sed.rs b/utils/conta/src/sed.rs → cli/conta/src/sed.rs
diff --git a/utils/elko/Cargo.toml → cli/elko/Cargo.toml b/utils/elko/Cargo.toml → cli/elko/Cargo.toml
diff --git a/utils/elko/src/build.rs → cli/elko/src/build.rs b/utils/elko/src/build.rs → cli/elko/src/build.rs
diff --git a/utils/elko/src/lib.rs → cli/elko/src/lib.rs b/utils/elko/src/lib.rs → cli/elko/src/lib.rs
diff --git a/utils/elko/src/new.rs → cli/elko/src/new.rs b/utils/elko/src/new.rs → cli/elko/src/new.rs
diff --git a/utils/elko/src/utils/manifest.rs → cli/elko/src/utils/manifest.rs b/utils/elko/src/utils/manifest.rs → cli/elko/src/utils/manifest.rs
diff --git a/utils/elko/src/utils/mod.rs → cli/elko/src/utils/mod.rs b/utils/elko/src/utils/mod.rs → cli/elko/src/utils/mod.rs
diff --git a/utils/elko/src/utils/result.rs → cli/elko/src/utils/result.rs b/utils/elko/src/utils/result.rs → cli/elko/src/utils/result.rs
diff --git a/utils/elko/src/utils/wasm.rs → cli/elko/src/utils/wasm.rs b/utils/elko/src/utils/wasm.rs → cli/elko/src/utils/wasm.rs
diff --git a/crates/opcodes/Cargo.toml → codegen/opcodes/Cargo.toml b/crates/opcodes/Cargo.toml → codegen/opcodes/Cargo.toml
diff --git a/crates/opcodes/README.md → codegen/opcodes/README.md b/crates/opcodes/README.md → codegen/opcodes/README.md
diff --git a/crates/opcodes/src/lib.rs → codegen/opcodes/src/lib.rs b/crates/opcodes/src/lib.rs → codegen/opcodes/src/lib.rs
diff --git a/crates/opcodes/src/shanghai.rs → codegen/opcodes/src/shanghai.rs b/crates/opcodes/src/shanghai.rs → codegen/opcodes/src/shanghai.rs
diff --git a/zink/README.md b/zink/README.md
@@ -0,0 +1,7 @@
+# Zink
+
+The standard library for zink projects.
+
+## LICENSE
+
+GPL-3.0
diff --git a/crates/codegen/Cargo.toml → zink/codegen/Cargo.toml b/crates/codegen/Cargo.toml → zink/codegen/Cargo.toml
diff --git a/crates/codegen/src/event.rs → zink/codegen/src/event.rs b/crates/codegen/src/event.rs → zink/codegen/src/event.rs
diff --git a/crates/codegen/src/lib.rs → zink/codegen/src/lib.rs b/crates/codegen/src/lib.rs → zink/codegen/src/lib.rs
diff --git a/crates/codegen/src/selector.rs → zink/codegen/src/selector.rs b/crates/codegen/src/selector.rs → zink/codegen/src/selector.rs
diff --git a/crates/codegen/src/storage.rs → zink/codegen/src/storage.rs b/crates/codegen/src/storage.rs → zink/codegen/src/storage.rs
diff --git a/src/ffi.rs → zink/src/ffi.rs b/src/ffi.rs → zink/src/ffi.rs
diff --git a/src/lib.rs → zink/src/lib.rs b/src/lib.rs → zink/src/lib.rs
diff --git a/src/traits.rs → zink/src/traits.rs b/src/traits.rs → zink/src/traits.rs
diff --git a/crates/zint/Cargo.toml → zint/Cargo.toml b/crates/zint/Cargo.toml → zint/Cargo.toml
diff --git a/crates/zint/README.md → zint/README.md b/crates/zint/README.md → zint/README.md
diff --git a/crates/zint/src/bytes.rs → zint/src/bytes.rs b/crates/zint/src/bytes.rs → zint/src/bytes.rs
diff --git a/crates/zint/src/evm.rs → zint/src/evm.rs b/crates/zint/src/evm.rs → zint/src/evm.rs
diff --git a/crates/zint/src/lib.rs → zint/src/lib.rs b/crates/zint/src/lib.rs → zint/src/lib.rs
diff --git a/crates/zint/tests/addition.rs → zint/tests/addition.rs b/crates/zint/tests/addition.rs → zint/tests/addition.rs