Skip to content

Commit 37a1fc5

Browse files
authored
chore(deps): remove chumsky (#538)
This removes the chumsky dependency, which was really just a `lettre` dependency, pinned to a specific version to avoid minimal version dependency issues. Also, this removes the workaround for rust-lang/rust#141626 which should be no longer needed now.
1 parent 64efde6 commit 37a1fc5

10 files changed

Lines changed: 11 additions & 36 deletions

.cargo/config.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
[resolver]
22
incompatible-rust-versions = "fallback"
3-
4-
# TODO: Safe to remove once https://github.com/rust-lang/rust/issues/141626 gets resolved.
5-
# Also, see https://github.com/cot-rs/cot/pull/419/changes#r2636869773 for more info.
6-
[target.x86_64-pc-windows-msvc]
7-
linker = "rust-lld"
8-
rustflags = ["-C", "symbol-mangling-version=v0"]

Cargo.lock

Lines changed: 0 additions & 10 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
@@ -77,7 +77,6 @@ bytes = "1.11"
7777
cargo_toml = "0.22"
7878
chrono = { version = "0.4.44", default-features = false }
7979
chrono-tz = { version = "0.10.4", default-features = false }
80-
chumsky = { version = "0.9.3", default-features = false }
8180
clap = { version = "4.5.60", features = ["deprecated"] }
8281
clap-verbosity-flag = { version = "3", default-features = false }
8382
clap_complete = "4"
@@ -109,7 +108,7 @@ humantime = "2"
109108
indexmap = "2"
110109
insta = { version = "1", features = ["filters"] }
111110
insta-cmd = "0.6"
112-
lettre = { version = "0.11", default-features = false }
111+
lettre = { version = "0.11.20", default-features = false }
113112
idna = { version = "1.1", default-features = false }
114113
mime = "0.3"
115114
mime_guess = { version = "2", default-features = false }

cot-cli/src/new_project.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ macro_rules! project_file {
1313
};
1414
}
1515

16-
const PROJECT_FILES: [(&str, &str); 11] = [
16+
const PROJECT_FILES: [(&str, &str); 10] = [
1717
project_file!("Cargo.toml.template"),
1818
project_file!("Cargo.lock.template"),
1919
project_file!("bacon.toml"),
@@ -24,7 +24,6 @@ const PROJECT_FILES: [(&str, &str); 11] = [
2424
project_file!("templates/index.html"),
2525
project_file!("config/dev.toml"),
2626
project_file!("config/prod.toml.example"),
27-
project_file!(".cargo/config.toml"),
2827
];
2928

3029
#[derive(Debug, Clone, PartialEq, Eq, Hash)]

cot-cli/src/project_template/.cargo/config.toml

Lines changed: 0 additions & 4 deletions
This file was deleted.

cot-cli/tests/snapshot_testing/new/snapshots/cli__snapshot_testing__new__create_new_project-5.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: cot-cli/tests/snapshot_testing/new/mod.rs
3+
assertion_line: 19
34
description: "Verbosity level: debug"
45
info:
56
program: cot
67
args:
78
- new
89
- "-vvvv"
9-
- /tmp/cot-test-s3CCv5/project
10+
- /tmp/cot-test-wx12rx/project
1011
---
1112
success: true
1213
exit_code: 0
@@ -21,7 +22,6 @@ TIMESTAMP TRACE cot_cli::new_project: Writing file: "/t
2122
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/templates/index.html"
2223
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/dev.toml"
2324
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/prod.toml.example"
24-
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/.cargo/config.toml"
2525

2626
----- stderr -----
2727
 Creating Cot project `project`

cot-cli/tests/snapshot_testing/new/snapshots/cli__snapshot_testing__new__create_new_project-6.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
---
22
source: cot-cli/tests/snapshot_testing/new/mod.rs
3+
assertion_line: 19
34
description: "Verbosity level: trace"
45
info:
56
program: cot
67
args:
78
- new
89
- "-vvvvv"
9-
- /tmp/cot-test-KRWMM5/project
10+
- /tmp/cot-test-Js5C41/project
1011
---
1112
success: true
1213
exit_code: 0
@@ -21,7 +22,6 @@ TIMESTAMP TRACE cot_cli::new_project: Writing file: "/t
2122
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/templates/index.html"
2223
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/dev.toml"
2324
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/prod.toml.example"
24-
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/.cargo/config.toml"
2525

2626
----- stderr -----
2727
 Creating Cot project `project`

cot-cli/tests/snapshot_testing/new/snapshots/cli__snapshot_testing__new__create_new_project_with_custom_name-5.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
source: cot-cli/tests/snapshot_testing/new/mod.rs
3+
assertion_line: 39
34
description: "Verbosity level: debug"
45
info:
56
program: cot
@@ -8,7 +9,7 @@ info:
89
- "--name"
910
- my_project
1011
- "-vvvv"
11-
- /tmp/cot-test-uCHzuc/project
12+
- /tmp/cot-test-DV1WlL/project
1213
---
1314
success: true
1415
exit_code: 0
@@ -23,7 +24,6 @@ TIMESTAMP TRACE cot_cli::new_project: Writing file: "/t
2324
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/templates/index.html"
2425
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/dev.toml"
2526
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/prod.toml.example"
26-
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/.cargo/config.toml"
2727

2828
----- stderr -----
2929
 Creating Cot project `my_project`

cot-cli/tests/snapshot_testing/new/snapshots/cli__snapshot_testing__new__create_new_project_with_custom_name-6.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
source: cot-cli/tests/snapshot_testing/new/mod.rs
3+
assertion_line: 39
34
description: "Verbosity level: trace"
45
info:
56
program: cot
@@ -8,7 +9,7 @@ info:
89
- "--name"
910
- my_project
1011
- "-vvvvv"
11-
- /tmp/cot-test-sFO2nz/project
12+
- /tmp/cot-test-uTUkrT/project
1213
---
1314
success: true
1415
exit_code: 0
@@ -23,7 +24,6 @@ TIMESTAMP TRACE cot_cli::new_project: Writing file: "/t
2324
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/templates/index.html"
2425
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/dev.toml"
2526
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/config/prod.toml.example"
26-
TIMESTAMP TRACE cot_cli::new_project: Writing file: "/tmp/TEMP_PATH/project/.cargo/config.toml"
2727

2828
----- stderr -----
2929
 Creating Cot project `my_project`

cot/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ blake3.workspace = true
2424
bytes.workspace = true
2525
chrono = { workspace = true, features = ["alloc", "serde", "clock"] }
2626
chrono-tz.workspace = true
27-
chumsky = { workspace = true, optional = true }
2827
clap.workspace = true
2928
cot_core.workspace = true
3029
cot_macros.workspace = true
@@ -93,8 +92,6 @@ ignored = [
9392
# versions are used
9493
"ahash",
9594
# Used by `lettre`, but it causes dependency issues if minimal dependency versions are used
96-
"chumsky",
97-
# Used by `lettre`, but it causes dependency issues if minimal dependency versions are used
9895
"idna",
9996
# time requires version 0.3.35 to work with the latest versions of Rust, but we don't use it directly
10097
"time",
@@ -105,7 +102,7 @@ default = ["sqlite", "postgres", "mysql", "json"]
105102
full = ["default", "fake", "live-reload", "test", "cache", "redis", "email"]
106103
fake = ["dep:fake"]
107104
db = ["dep:sea-query", "dep:sea-query-binder", "dep:sqlx"]
108-
email = ["dep:lettre", "dep:chumsky", "dep:idna"]
105+
email = ["dep:lettre", "dep:idna"]
109106
sqlite = ["db", "sea-query/backend-sqlite", "sea-query-binder/sqlx-sqlite", "sqlx/sqlite"]
110107
postgres = ["db", "sea-query/backend-postgres", "sea-query-binder/sqlx-postgres", "sqlx/postgres"]
111108
mysql = ["db", "sea-query/backend-mysql", "sea-query-binder/sqlx-mysql", "sqlx/mysql"]

0 commit comments

Comments
 (0)