Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 46 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cargo-features = []

[workspace]
resolver = "3"
members = ["cli", "lib", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]
members = ["cli", "lib", "lib/core", "lib/gen-protos", "lib/proc-macros", "lib/testutils"]

[workspace.package]
version = "0.43.0"
Expand Down Expand Up @@ -139,6 +139,8 @@ winreg = "0.56"

# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block
jj-core = { path = "lib/core", version = "0.43.0", default-features = false }
jj-core-proc-macros = { path = "lib/core/proc-macros", version = "0.43.0" }
jj-lib = { path = "lib", version = "0.43.0", default-features = false }
jj-lib-proc-macros = { path = "lib/proc-macros", version = "0.43.0" }
testutils = { path = "lib/testutils" }
Expand Down
3 changes: 2 additions & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ hashbrown = { workspace = true }
indexmap = { workspace = true }
interim = { workspace = true }
itertools = { workspace = true }
jj-lib-proc-macros = { workspace = true }
jj-core = { workspace = true }
jj-core-proc-macros = { workspace = true }
maplit = { workspace = true }
memchr = { workspace = true }
once_cell = { workspace = true }
Expand Down
47 changes: 47 additions & 0 deletions lib/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[package]
name = "jj-core"
version.workspace = true
license.workspace = true
rust-version.workspace = true
edition.workspace = true
readme.workspace = true
homepage.workspace = true
repository.workspace = true
documentation.workspace = true
categories.workspace = true
keywords.workspace = true

[dependencies]

blake2 = { workspace = true }
chrono = { workspace = true }
clru = { workspace = true }
digest = { workspace = true }
etcetera = { workspace = true }
futures = { workspace = true }
itertools = { workspace = true }
jj-core-proc-macros = { workspace = true }
pest = { workspace = true }
pest_derive = { workspace = true }
pollster = { workspace = true }
ref-cast = { workspace = true }
serde = { workspace = true }
smallvec = { workspace = true }
strsim = { workspace = true }
tempfile = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
tracing = { workspace = true }

[dev-dependencies]
assert_matches = { workspace = true }
eyre = { workspace = true }
insta = { workspace = true }
test-case = { workspace = true }

[target.'cfg(windows)'.dependencies]
same-file = { workspace = true }
winreg = { workspace = true }

[lints]
workspace = true
26 changes: 26 additions & 0 deletions lib/core/proc-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[package]
name = "jj-core-proc-macros"
description = "Proc macros for the jj-core crate"

categories.workspace = true
documentation.workspace = true
edition.workspace = true
homepage.workspace = true
keywords.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
rust-version.workspace = true
version.workspace = true
include = ["/LICENSE", "/src/"]

[lib]
proc-macro = true

[dependencies]
proc-macro2 = { workspace = true }
quote = { workspace = true }
syn = { workspace = true }

[lints]
workspace = true
Loading