Skip to content

Commit

Permalink
Revert workspace inheritance for workspace deps (#845)
Browse files Browse the repository at this point in the history 
A recent publish with craft failed because it claims "Circular dependency detected!".
This is most likely caused by the recent change to using workspace dependency inheritance,
and lack thereof within craft.

So just revert this change, to hopefully make craft happy.
  • Loading branch information
@Swatinem
Swatinem authored Jun 4, 2024
1 parent 9fec9ed commit d036567
Show file tree
Hide file tree
Showing 22 changed files with 81 additions and 79 deletions.
24 changes: 12 additions & 12 deletions Cargo.lock
View file

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

11 changes: 0 additions & 11 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,6 @@ similar-asserts = "1.4.2"
smallvec = "1.10.0"
sourcemap = "8.0.1"
stable_deref_trait = "1.2.0"
symbolic = { version = "12.8.0", path = "symbolic" }
symbolic-cfi = { version = "12.8.0", path = "symbolic-cfi" }
symbolic-common = { version = "12.8.0", path = "symbolic-common" }
symbolic-debuginfo = { version = "12.8.0", path = "symbolic-debuginfo" }
symbolic-demangle = { version = "12.8.0", path = "symbolic-demangle" }
symbolic-il2cpp = { version = "12.8.0", path = "symbolic-il2cpp" }
symbolic-ppdb = { version = "12.8.0", path = "symbolic-ppdb" }
symbolic-sourcemapcache = { version = "12.8.0", path = "symbolic-sourcemapcache" }
symbolic-symcache = { version = "12.8.0", path = "symbolic-symcache" }
symbolic-testutils = { path = "symbolic-testutils" }
symbolic-unreal = { version = "12.8.0", path = "symbolic-unreal" }
tempfile = "3.4.0"
thiserror = "1.0.39"
time = { version = "0.3.20", features = ["formatting"] }
Expand Down
2 changes: 1 addition & 1 deletion examples/addr2line/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false
[dependencies]
anyhow = { workspace = true }
clap = { workspace = true }
symbolic = { workspace = true, features = ["demangle"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = ["demangle"] }
4 changes: 3 additions & 1 deletion examples/debuginfo_debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ publish = false
[dependencies]
anyhow = { workspace = true }
clap = { workspace = true }
symbolic = { workspace = true, features = ["demangle"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = [
"demangle",
] }
2 changes: 1 addition & 1 deletion examples/dump_cfi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ publish = false
[dependencies]
anyhow = { workspace = true }
clap = { workspace = true }
symbolic = { workspace = true, features = ["cfi"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = ["cfi"] }
2 changes: 1 addition & 1 deletion examples/dump_sources/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ publish = false

[dependencies]
clap = { workspace = true }
symbolic = { workspace = true }
symbolic = { version = "12.8.0", path = "../../symbolic" }
6 changes: 5 additions & 1 deletion examples/minidump_stackwalk/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ clap = { workspace = true }
minidump = { workspace = true }
minidump-processor = { workspace = true }
minidump-unwind = { workspace = true }
symbolic = { workspace = true, features = ["symcache", "demangle", "cfi"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = [
"symcache",
"demangle",
"cfi",
] }
thiserror = { workspace = true }
tokio = { workspace = true, features = ["macros", "rt"] }
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion examples/object_debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ publish = false

[dependencies]
clap = { workspace = true }
symbolic = { workspace = true }
symbolic = { version = "12.8.0", path = "../../symbolic" }
6 changes: 4 additions & 2 deletions examples/sourcemapcache_debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ publish = false
[dependencies]
anyhow = { workspace = true }
clap = { workspace = true }
symbolic = { workspace = true, features = ["sourcemapcache"] }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = [
"sourcemapcache",
] }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
6 changes: 5 additions & 1 deletion examples/symcache_debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,8 @@ publish = false
[dependencies]
anyhow = { workspace = true }
clap = { workspace = true }
symbolic = { workspace = true, features = ["symcache", "demangle", "il2cpp"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = [
"symcache",
"demangle",
"il2cpp",
] }
4 changes: 3 additions & 1 deletion examples/unreal_engine_crash/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ publish = false

[dependencies]
clap = { workspace = true }
symbolic = { workspace = true, features = ["unreal"] }
symbolic = { version = "12.8.0", path = "../../symbolic", features = [
"unreal",
] }
7 changes: 6 additions & 1 deletion symbolic-cabi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,10 @@ crate-type = ["cdylib"]
[dependencies]
proguard = { workspace = true, features = ["uuid"] }
sourcemap = { workspace = true }
symbolic = { workspace = true, features = ["cfi", "debuginfo", "sourcemapcache", "symcache"] }
symbolic = { version = "12.8.0", path = "../symbolic", features = [
"cfi",
"debuginfo",
"sourcemapcache",
"symcache",
] }
tempfile = { workspace = true }
6 changes: 3 additions & 3 deletions symbolic-cfi/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ A library to process call frame information
edition = "2021"

[dependencies]
symbolic-common = { workspace = true }
symbolic-debuginfo = { workspace = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
symbolic-debuginfo = { version = "12.8.0", path = "../symbolic-debuginfo" }
thiserror = { workspace = true }

[dev-dependencies]
insta = { workspace = true }
symbolic-testutils = { workspace = true }
similar-asserts = { workspace = true }
symbolic-testutils = { path = "../symbolic-testutils" }
2 changes: 1 addition & 1 deletion symbolic-common/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ serde = { workspace = true, optional = true }
uuid = { workspace = true }

[dev-dependencies]
symbolic-testutils = { workspace = true }
symbolic-testutils = { path = "../symbolic-testutils" }
tempfile = { workspace = true }
similar-asserts = { workspace = true }
6 changes: 3 additions & 3 deletions symbolic-debuginfo/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ scroll = { workspace = true, optional = true }
serde = { workspace = true }
serde_json = { workspace = true, optional = true }
smallvec = { workspace = true, optional = true }
symbolic-common = { workspace = true }
symbolic-ppdb = { workspace = true, optional = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
symbolic-ppdb = { version = "12.8.0", path = "../symbolic-ppdb", optional = true }
thiserror = { workspace = true }
wasmparser = { workspace = true, optional = true }
zip = { workspace = true, optional = true }
Expand All @@ -118,7 +118,7 @@ criterion = { workspace = true }
insta = { workspace = true }
tempfile = { workspace = true }
similar-asserts = { workspace = true }
symbolic-testutils = { workspace = true }
symbolic-testutils = { path = "../symbolic-testutils" }

[[bench]]
name = "breakpad_parser"
Expand Down
6 changes: 2 additions & 4 deletions symbolic-demangle/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ A library to demangle symbols from various languages and compilers.
build = "build.rs"
edition = "2021"

exclude = [
"tests/**/*",
]
exclude = ["tests/**/*"]

[package.metadata.docs.rs]
all-features = true
Expand All @@ -34,7 +32,7 @@ swift = ["cc"]
cpp_demangle = { workspace = true, optional = true }
msvc-demangler = { workspace = true, optional = true }
rustc-demangle = { workspace = true, optional = true }
symbolic-common = { workspace = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }

[build-dependencies]
cc = { workspace = true, optional = true }
Expand Down
4 changes: 2 additions & 2 deletions symbolic-il2cpp/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ edition = "2021"
[dependencies]
indexmap = { workspace = true }
serde_json = { workspace = true }
symbolic-common = { workspace = true }
symbolic-debuginfo = { workspace = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
symbolic-debuginfo = { version = "12.8.0", path = "../symbolic-debuginfo" }
16 changes: 8 additions & 8 deletions symbolic-ppdb/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version = "12.8.0"
license = "MIT"
authors = [
"Sebastian Zivota <sebastian.zivota@sentry.io>",
"Arpad Borsos <arpad.borsos@sentry.io>"
"Arpad Borsos <arpad.borsos@sentry.io>",
]
documentation = "https://docs.rs/symbolic-ppdb"
homepage = "https://github.com/getsentry/symbolic"
Expand All @@ -20,15 +20,15 @@ exclude = ["tests/**/*"]
all-features = true

[dependencies]
flate2 = { workspace = true }
indexmap = { workspace = true }
symbolic-common = { workspace = true }
watto = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
thiserror = { workspace = true }
uuid = { workspace = true }
flate2 = { workspace = true }
serde_json = { workspace = true }
serde = { workspace = true }
watto = { workspace = true }

[dev-dependencies]
symbolic-debuginfo = { workspace = true }
symbolic-testutils = { workspace = true }
symbolic-debuginfo = { path = "../symbolic-debuginfo" }
symbolic-testutils = { path = "../symbolic-testutils" }
4 changes: 2 additions & 2 deletions symbolic-sourcemapcache/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ edition = "2021"
itertools = { workspace = true }
js-source-scopes = { workspace = true }
sourcemap = { workspace = true }
symbolic-common = { workspace = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
thiserror = { workspace = true }
tracing = { workspace = true }
watto = { workspace = true }

[dev-dependencies]
symbolic-testutils = { workspace = true }
symbolic-testutils = { path = "../symbolic-testutils" }
16 changes: 7 additions & 9 deletions symbolic-symcache/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,24 @@ stack frames in debugging information.
"""
edition = "2021"

exclude = [
"tests/**/*",
]
exclude = ["tests/**/*"]

[package.metadata.docs.rs]
all-features = true

[dependencies]
symbolic-common = { workspace = true }
symbolic-debuginfo = { workspace = true }
symbolic-il2cpp = { workspace = true, optional = true }
thiserror = { workspace = true }
indexmap = { workspace = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
symbolic-debuginfo = { version = "12.8.0", path = "../symbolic-debuginfo" }
symbolic-il2cpp = { version = "12.8.0", path = "../symbolic-il2cpp", optional = true }
thiserror = { workspace = true }
tracing = { workspace = true }
watto = { workspace = true }

[dev-dependencies]
insta = { workspace = true }
criterion = { workspace = true }
symbolic-testutils = { workspace = true }
insta = { workspace = true }
symbolic-testutils = { path = "../symbolic-testutils" }

[features]
bench = []
Expand Down
6 changes: 2 additions & 4 deletions symbolic-unreal/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ Parsing and processing utilities for Unreal Engine 4 crash files.
"""
edition = "2021"

exclude = [
"tests/**/*",
]
exclude = ["tests/**/*"]

[package.metadata.docs.rs]
all-features = true
Expand All @@ -40,5 +38,5 @@ time = { workspace = true }

[dev-dependencies]
insta = { workspace = true }
symbolic-testutils = { workspace = true }
similar-asserts = { workspace = true }
symbolic-testutils = { path = "../symbolic-testutils" }
18 changes: 9 additions & 9 deletions symbolic/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ unreal = ["symbolic-unreal"]
unreal-serde = ["unreal", "common-serde", "symbolic-unreal/serde"]

[dependencies]
symbolic-cfi = { workspace = true, optional = true }
symbolic-common = { workspace = true }
symbolic-debuginfo = { workspace = true, optional = true }
symbolic-demangle = { workspace = true, optional = true }
symbolic-il2cpp = { workspace = true, optional = true }
symbolic-ppdb = { workspace = true, optional = true }
symbolic-sourcemapcache = { workspace = true, optional = true }
symbolic-symcache = { workspace = true, optional = true }
symbolic-unreal = { workspace = true, optional = true }
symbolic-cfi = { version = "12.8.0", path = "../symbolic-cfi", optional = true }
symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
symbolic-debuginfo = { version = "12.8.0", path = "../symbolic-debuginfo", optional = true }
symbolic-demangle = { version = "12.8.0", path = "../symbolic-demangle", optional = true }
symbolic-il2cpp = { version = "12.8.0", path = "../symbolic-il2cpp", optional = true }
symbolic-ppdb = { version = "12.8.0", path = "../symbolic-ppdb", optional = true }
symbolic-sourcemapcache = { version = "12.8.0", path = "../symbolic-sourcemapcache", optional = true }
symbolic-symcache = { version = "12.8.0", path = "../symbolic-symcache", optional = true }
symbolic-unreal = { version = "12.8.0", path = "../symbolic-unreal", optional = true }

0 comments on commit d036567

Please sign in to comment.