Merge pull request #8 from 0xPolygonZero/zbrown/fix-name-collision

Rename to `paladin-core` to fix crates.io name collision
0xPolygonZero · Oct 23, 2023 · 2375d47 · 2375d47
2 parents 2538664 + 3941b75
commit 2375d47
Show file tree

Hide file tree

Showing 32 changed files with 49 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["paladin", "paladin-opkind-derive"]
+members = ["paladin-core", "paladin-opkind-derive"]
 resolver = "2"
 
 [workspace.package]

diff --git a/examples/hello-world-rabbitmq/Cargo.lock b/examples/hello-world-rabbitmq/Cargo.lock
diff --git a/examples/hello-world-rabbitmq/leader.Dockerfile b/examples/hello-world-rabbitmq/leader.Dockerfile
@@ -2,28 +2,28 @@ FROM rust:slim-bullseye as builder
 
 RUN \
   mkdir -p paladin-opkind-derive/src  && touch paladin-opkind-derive/src/lib.rs && \
-  mkdir -p paladin/src        && touch paladin/src/lib.rs && \
-  mkdir -p ops/src            && touch ops/src/lib.rs && \
-  mkdir -p leader/src         && echo "fn main() {println!(\"YO!\");}" > leader/src/main.rs
+  mkdir -p paladin-core/src           && touch paladin-core/src/lib.rs && \
+  mkdir -p ops/src                    && touch ops/src/lib.rs && \
+  mkdir -p leader/src                 && echo "fn main() {println!(\"YO!\");}" > leader/src/main.rs
 
 COPY Cargo.toml .
-RUN sed -i "2s/.*/members = [\"paladin\", \"paladin-opkind-derive\", \"ops\", \"leader\"]/" Cargo.toml
+RUN sed -i "2s/.*/members = [\"paladin-core\", \"paladin-opkind-derive\", \"ops\", \"leader\"]/" Cargo.toml
 COPY Cargo.lock .
 
 COPY paladin-opkind-derive/Cargo.toml ./paladin-opkind-derive/Cargo.toml
-COPY paladin/Cargo.toml ./paladin/Cargo.toml
+COPY paladin-core/Cargo.toml ./paladin-core/Cargo.toml
 COPY examples/hello-world-rabbitmq/ops/Cargo.toml ./ops/Cargo.toml
 COPY examples/hello-world-rabbitmq/leader/Cargo.toml ./leader/Cargo.toml
 
 RUN cargo build --release --bin leader 
 
 COPY paladin-opkind-derive ./paladin-opkind-derive
-COPY paladin ./paladin
+COPY paladin-core ./paladin-core
 COPY examples/hello-world-rabbitmq/ops ./ops
 COPY examples/hello-world-rabbitmq/leader ./leader
 RUN \
   touch paladin-opkind-derive/src/lib.rs && \
-  touch paladin/src/lib.rs && \
+  touch paladin-core/src/lib.rs && \
   touch ops/src/lib.rs && \
   touch leader/src/main.rs
 

diff --git a/examples/hello-world-rabbitmq/leader/Cargo.toml b/examples/hello-world-rabbitmq/leader/Cargo.toml
@@ -14,5 +14,5 @@ tokio = { version = "1.32.0", features = ["full"] }
 futures = "0.3.28"
 clap = { version = "4.4.2", features = ["derive", "env"] }
 
-paladin = { path = "../../../paladin" }
+paladin-core = { path = "../../../paladin-core" }
 ops = { path = "../ops" }
diff --git a/examples/hello-world-rabbitmq/ops/Cargo.toml b/examples/hello-world-rabbitmq/ops/Cargo.toml
@@ -11,4 +11,4 @@ anyhow = "1.0.75"
 futures = "0.3.28"
 async-trait = "0.1.73"
 
-paladin = { path = "../../../paladin" }
+paladin-core = { path = "../../../paladin-core" }
diff --git a/examples/hello-world-rabbitmq/worker.Dockerfile b/examples/hello-world-rabbitmq/worker.Dockerfile
@@ -2,28 +2,28 @@ FROM rust:slim-bullseye as builder
 
 RUN \
   mkdir -p paladin-opkind-derive/src  && touch paladin-opkind-derive/src/lib.rs && \
-  mkdir -p paladin/src        && touch paladin/src/lib.rs && \
-  mkdir -p ops/src            && touch ops/src/lib.rs && \
-  mkdir -p worker/src         && echo "fn main() {}" > worker/src/main.rs
+  mkdir -p paladin-core/src           && touch paladin-core/src/lib.rs && \
+  mkdir -p ops/src                    && touch ops/src/lib.rs && \
+  mkdir -p worker/src                 && echo "fn main() {}" > worker/src/main.rs
 
 COPY Cargo.toml .
-RUN sed -i "2s/.*/members = [\"paladin\", \"paladin-opkind-derive\", \"ops\", \"worker\"]/" Cargo.toml
+RUN sed -i "2s/.*/members = [\"paladin-core\", \"paladin-opkind-derive\", \"ops\", \"worker\"]/" Cargo.toml
 COPY Cargo.lock .
 
 COPY paladin-opkind-derive/Cargo.toml ./paladin-opkind-derive/Cargo.toml
-COPY paladin/Cargo.toml ./paladin/Cargo.toml
+COPY paladin-core/Cargo.toml ./paladin-core/Cargo.toml
 COPY examples/hello-world-rabbitmq/ops/Cargo.toml ./ops/Cargo.toml
 COPY examples/hello-world-rabbitmq/worker/Cargo.toml ./worker/Cargo.toml
 
 RUN cargo build --release --bin worker
 
 COPY paladin-opkind-derive ./paladin-opkind-derive
-COPY paladin ./paladin
+COPY paladin-core ./paladin-core
 COPY examples/hello-world-rabbitmq/ops ./ops
 COPY examples/hello-world-rabbitmq/worker ./worker
 RUN \
   touch paladin-opkind-derive/src/lib.rs && \
-  touch paladin/src/lib.rs && \
+  touch paladin-core/src/lib.rs && \
   touch ops/src/lib.rs && \
   touch worker/src/main.rs
 

diff --git a/examples/hello-world-rabbitmq/worker/Cargo.toml b/examples/hello-world-rabbitmq/worker/Cargo.toml
@@ -14,5 +14,5 @@ tokio = { version = "1.32.0", features = ["full"] }
 futures = "0.3.28"
 clap = { version = "4.4.2", features = ["derive", "env"] }
 
-paladin = { path = "../../../paladin" }
+paladin-core = { path = "../../../paladin-core" }
 ops = { path = "../ops" }
diff --git a/paladin/Cargo.toml → paladin-core/Cargo.toml b/paladin/Cargo.toml → paladin-core/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "paladin"
+name = "paladin-core"
 version = "0.1.0"
 description = "A Rust distributed algorithm toolkit. Write distributed algorithms without the complexities of distributed systems programming."
 license.workspace = true
@@ -9,7 +9,8 @@ repository.workspace = true
 keywords.workspace = true
 categories.workspace = true
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "paladin"
 
 [dependencies]
 anyhow = { version = "1.0.75", features = ["backtrace"] }
@@ -28,7 +29,7 @@ futures = "0.3.28"
 uuid = { version = "1.4.1", features = ["v4", "fast-rng"] }
 clap = { version = "4.4.2", features = ["derive", "env"] }
 pin-project = "1.1.3"
-paladin-opkind-derive = { path = "../paladin-opkind-derive" }
+paladin-opkind-derive = "0.1.0"
 
 [dev-dependencies]
 # Required for certain doc tests which showcase generic numeric operations

diff --git a/paladin/src/acker.rs → paladin-core/src/acker.rs b/paladin/src/acker.rs → paladin-core/src/acker.rs
diff --git a/...l/coordinated_channel/coordinated_sink.rs → ...l/coordinated_channel/coordinated_sink.rs b/...l/coordinated_channel/coordinated_sink.rs → ...l/coordinated_channel/coordinated_sink.rs
diff --git a/...coordinated_channel/coordinated_stream.rs → ...coordinated_channel/coordinated_stream.rs b/...coordinated_channel/coordinated_stream.rs → ...coordinated_channel/coordinated_stream.rs
diff --git a/...in/src/channel/coordinated_channel/mod.rs → ...re/src/channel/coordinated_channel/mod.rs b/...in/src/channel/coordinated_channel/mod.rs → ...re/src/channel/coordinated_channel/mod.rs
diff --git a/paladin/src/channel/mod.rs → paladin-core/src/channel/mod.rs b/paladin/src/channel/mod.rs → paladin-core/src/channel/mod.rs
diff --git a/paladin/src/channel/queue.rs → paladin-core/src/channel/queue.rs b/paladin/src/channel/queue.rs → paladin-core/src/channel/queue.rs
diff --git a/paladin/src/config/mod.rs → paladin-core/src/config/mod.rs b/paladin/src/config/mod.rs → paladin-core/src/config/mod.rs
diff --git a/paladin/src/contiguous/mod.rs → paladin-core/src/contiguous/mod.rs b/paladin/src/contiguous/mod.rs → paladin-core/src/contiguous/mod.rs
diff --git a/paladin/src/contiguous/queue.rs → paladin-core/src/contiguous/queue.rs b/paladin/src/contiguous/queue.rs → paladin-core/src/contiguous/queue.rs
diff --git a/.../src/directive/indexed_stream/foldable.rs → .../src/directive/indexed_stream/foldable.rs b/.../src/directive/indexed_stream/foldable.rs → .../src/directive/indexed_stream/foldable.rs
diff --git a/...n/src/directive/indexed_stream/functor.rs → ...e/src/directive/indexed_stream/functor.rs b/...n/src/directive/indexed_stream/functor.rs → ...e/src/directive/indexed_stream/functor.rs
diff --git a/paladin/src/directive/indexed_stream/mod.rs → ...-core/src/directive/indexed_stream/mod.rs b/paladin/src/directive/indexed_stream/mod.rs → ...-core/src/directive/indexed_stream/mod.rs
diff --git a/paladin/src/directive/mod.rs → paladin-core/src/directive/mod.rs b/paladin/src/directive/mod.rs → paladin-core/src/directive/mod.rs
diff --git a/paladin/src/lib.rs → paladin-core/src/lib.rs b/paladin/src/lib.rs → paladin-core/src/lib.rs
diff --git a/paladin/src/operation/mod.rs → paladin-core/src/operation/mod.rs b/paladin/src/operation/mod.rs → paladin-core/src/operation/mod.rs
diff --git a/paladin/src/queue/amqp.rs → paladin-core/src/queue/amqp.rs b/paladin/src/queue/amqp.rs → paladin-core/src/queue/amqp.rs
diff --git a/paladin/src/queue/in_memory.rs → paladin-core/src/queue/in_memory.rs b/paladin/src/queue/in_memory.rs → paladin-core/src/queue/in_memory.rs
diff --git a/paladin/src/queue/mod.rs → paladin-core/src/queue/mod.rs b/paladin/src/queue/mod.rs → paladin-core/src/queue/mod.rs
diff --git a/paladin/src/queue/sink.rs → paladin-core/src/queue/sink.rs b/paladin/src/queue/sink.rs → paladin-core/src/queue/sink.rs
diff --git a/paladin/src/runtime/dynamic_channel.rs → paladin-core/src/runtime/dynamic_channel.rs b/paladin/src/runtime/dynamic_channel.rs → paladin-core/src/runtime/dynamic_channel.rs
diff --git a/paladin/src/runtime/mod.rs → paladin-core/src/runtime/mod.rs b/paladin/src/runtime/mod.rs → paladin-core/src/runtime/mod.rs
diff --git a/paladin/src/serializer/mod.rs → paladin-core/src/serializer/mod.rs b/paladin/src/serializer/mod.rs → paladin-core/src/serializer/mod.rs
diff --git a/paladin/src/task/mod.rs → paladin-core/src/task/mod.rs b/paladin/src/task/mod.rs → paladin-core/src/task/mod.rs