Skip to content

Commit 995eaa5

Browse files
committed
Revert "move clarity-serialization to contrib. remove it from the workspace"
This reverts commit ad702c4.
1 parent a7b9193 commit 995eaa5

File tree

17 files changed

+56
-1200
lines changed

17 files changed

+56
-1200
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[alias]
22
stacks-node = "run --package stacks-node --"
33
fmt-stacks = "fmt -- --config group_imports=StdExternalCrate,imports_granularity=Module"
4-
clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
4+
clippy-stacks = "clippy -p stx-genesis -p libstackerdb -p stacks-signer -p pox-locking -p clarity-serialization -p clarity -p libsigner -p stacks-common --no-deps --tests --all-features -- -D warnings"
55
clippy-stackslib = "clippy -p stackslib --no-deps -- -Aclippy::all -Wclippy::indexing_slicing"
66

77
# Uncomment to improve performance slightly, at the cost of portability

Cargo.lock

Lines changed: 48 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ members = [
44
"stackslib",
55
"stacks-common",
66
"pox-locking",
7+
"clarity-serialization",
78
"clarity",
89
"stx-genesis",
910
"libstackerdb",
@@ -12,8 +13,6 @@ members = [
1213
"stacks-node",
1314
"contrib/tools/config-docs-generator"]
1415

15-
exclude = ["contrib/clarity-serialization"]
16-
1716
# Dependencies we want to keep the same between workspace members
1817
[workspace.dependencies]
1918
ed25519-dalek = { version = "2.1.1", default-features = false }

contrib/clarity-serialization/Cargo.toml renamed to clarity-serialization/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ keywords = [ "stacks", "stx", "bitcoin", "crypto", "blockstack", "decentralized"
1010
readme = "README.md"
1111

1212
[dependencies]
13-
lazy_static = "1.4.0"
13+
lazy_static = { workspace = true }
1414
regex = { version = "1", default-features = false }
15-
serde = { version = "1", features = ["derive"] }
16-
serde_derive = { version = "1" }
17-
slog = { version = "2.5.2", features = [ "max_level_trace" ] }
18-
stacks_common = { package = "stacks-common", path = "../../stacks-common", default-features = false }
19-
thiserror = { version = "1.0.65" }
15+
serde = { workspace = true }
16+
serde_derive = { workspace = true }
17+
slog = { workspace = true }
18+
stacks_common = { package = "stacks-common", path = "../stacks-common", default-features = false }
19+
thiserror = { workspace = true }
2020

2121
[dev-dependencies]
2222
mutants = "0.0.3"
File renamed without changes.

0 commit comments

Comments
 (0)