Skip to content

Commit 0d94356

Browse files
fix(deps): inherit workspace thiserror after migration
Use the centralized thiserror 2 dependency for all migrated consumers and remove their obsolete thiserror 1 compatibility exceptions. The existing Dependabot lockfile remains unchanged. Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
1 parent a0d70a4 commit 0d94356

12 files changed

Lines changed: 11 additions & 55 deletions

File tree

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,22 @@
11
{
2-
"src/cortex-agents/Cargo.toml:dependencies:thiserror": {
3-
"declaration": "1",
4-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
5-
},
62
"src/cortex-app-server/Cargo.toml:dependencies:dirs": {
73
"declaration": "5",
84
"reason": "Retains dirs 5 platform path behavior until its consumers are migrated and platform-tested."
95
},
10-
"src/cortex-batch/Cargo.toml:dependencies:thiserror": {
11-
"declaration": "1",
12-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
13-
},
14-
"src/cortex-compact/Cargo.toml:dependencies:thiserror": {
15-
"declaration": "1",
16-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
17-
},
186
"src/cortex-engine/Cargo.toml:dependencies:rand": {
197
"declaration": "0.8",
208
"reason": "Retains rand 0.8 Rng/generation APIs; upgrade requires a separate compatibility change."
219
},
22-
"src/cortex-ghost/Cargo.toml:dependencies:thiserror": {
23-
"declaration": "1",
24-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
25-
},
2610
"src/cortex-hooks/Cargo.toml:dependencies:dirs": {
2711
"declaration": "5.0",
2812
"reason": "Retains dirs 5 platform path behavior until its consumers are migrated and platform-tested."
2913
},
30-
"src/cortex-hooks/Cargo.toml:dependencies:thiserror": {
31-
"declaration": "1",
32-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
33-
},
3414
"src/cortex-linux-sandbox/Cargo.toml:target.cfg(target_os = \"linux\").dependencies:seccompiler": {
3515
"declaration": "0.4",
3616
"reason": "Retains seccompiler 0.4 sandbox filter API; changing sandbox policy needs a dedicated compatibility review."
3717
},
38-
"src/cortex-resume/Cargo.toml:dependencies:thiserror": {
39-
"declaration": "1",
40-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
41-
},
42-
"src/cortex-review/Cargo.toml:dependencies:thiserror": {
43-
"declaration": "1",
44-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
45-
},
46-
"src/cortex-share/Cargo.toml:dependencies:thiserror": {
47-
"declaration": "1",
48-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
49-
},
50-
"src/cortex-snapshot/Cargo.toml:dependencies:thiserror": {
51-
"declaration": "1",
52-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
53-
},
5418
"src/cortex-storage/Cargo.toml:dependencies:dirs": {
5519
"declaration": "5",
5620
"reason": "Retains dirs 5 platform path behavior until its consumers are migrated and platform-tested."
57-
},
58-
"src/cortex-storage/Cargo.toml:dependencies:thiserror": {
59-
"declaration": "1",
60-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
61-
},
62-
"src/cortex-windows-sandbox/Cargo.toml:dependencies:thiserror": {
63-
"declaration": "1",
64-
"reason": "Retains the existing thiserror 1 derive API until its consumers are migrated together."
6521
}
6622
}

‎src/cortex-agents/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ toml = { workspace = true }
1818
async-trait = { workspace = true }
1919
async-recursion = "1"
2020
tracing = { workspace = true }
21-
thiserror = "2"
21+
thiserror = { workspace = true }
2222
uuid = { workspace = true, features = ["v4"] }
2323
regex = { workspace = true }
2424
dirs = { workspace = true }

‎src/cortex-batch/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cortex-common = { workspace = true }
1313
tokio = { workspace = true, features = ["fs", "time", "sync"] }
1414
serde = { workspace = true, features = ["derive"] }
1515
tracing = { workspace = true }
16-
thiserror = "2"
16+
thiserror = { workspace = true }
1717
glob = { workspace = true }
1818
once_cell = { workspace = true }
1919

‎src/cortex-compact/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ workspace = true
1212
cortex-common = { workspace = true }
1313
serde = { workspace = true, features = ["derive"] }
1414
tracing = { workspace = true }
15-
thiserror = "2"
15+
thiserror = { workspace = true }
1616

1717
# For disk space detection on Unix
1818
[target.'cfg(unix)'.dependencies]

‎src/cortex-ghost/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ cortex-common = { workspace = true }
1313
tokio = { workspace = true, features = ["process"] }
1414
serde = { workspace = true, features = ["derive"] }
1515
tracing = { workspace = true }
16-
thiserror = "2"
16+
thiserror = { workspace = true }
1717
chrono = { workspace = true, features = ["serde"] }
1818
tempfile = { workspace = true }

‎src/cortex-hooks/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tokio = { workspace = true, features = ["process", "sync"] }
1414
serde = { workspace = true, features = ["derive"] }
1515
serde_json = { workspace = true }
1616
tracing = { workspace = true }
17-
thiserror = "2"
17+
thiserror = { workspace = true }
1818
glob = { workspace = true }
1919
lazy_static = { workspace = true }
2020
dirs = "5.0"

‎src/cortex-resume/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tokio = { workspace = true, features = ["fs", "time", "sync"] }
1313
serde = { workspace = true, features = ["derive"] }
1414
serde_json = { workspace = true }
1515
tracing = { workspace = true }
16-
thiserror = "2"
16+
thiserror = { workspace = true }
1717
chrono = { workspace = true, features = ["serde"] }
1818
once_cell = { workspace = true }
1919

‎src/cortex-review/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ workspace = true
1111
[dependencies]
1212
tokio = { workspace = true, features = ["process"] }
1313
serde = { workspace = true, features = ["derive"] }
14-
thiserror = "2"
14+
thiserror = { workspace = true }

‎src/cortex-share/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ tokio = { workspace = true }
1414
serde = { workspace = true, features = ["derive"] }
1515
serde_json = { workspace = true }
1616
tracing = { workspace = true }
17-
thiserror = "2"
17+
thiserror = { workspace = true }
1818
reqwest = { workspace = true }
1919
chrono = { workspace = true, features = ["serde"] }

‎src/cortex-snapshot/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ tokio = { workspace = true, features = ["process"] }
1313
serde = { workspace = true, features = ["derive"] }
1414
serde_json = { workspace = true }
1515
tracing = { workspace = true }
16-
thiserror = "2"
16+
thiserror = { workspace = true }
1717
chrono = { workspace = true, features = ["serde"] }
1818
uuid = { workspace = true, features = ["v4"] }
1919
sha2 = { workspace = true }

0 commit comments

Comments
 (0)