Skip to content

Commit 18126be

Browse files
committed
Merge #231: chore: update major version dependencies
846b509 chore: update derive_more from 0.99 to 2.1 (Jose Celano) 16c0dd0 chore: update rstest from 0.23 to 0.26 (Jose Celano) ab76e06 chore: update thiserror from 1.0 to 2.0 (Jose Celano) 2fda539 chore: update testcontainers from 0.25 to 0.26 (Jose Celano) Pull request description: This PR updates the following major version dependencies: - testcontainers: 0.25 → 0.26 - thiserror: 1.0 → 2.0 - rstest: 0.23 → 0.26 - derive_more: 0.99 → 2.1 Each dependency was updated incrementally with pre-commit checks passing after each update. ## Changes ### derive_more 2.1 - Added explicit features: `display` and `from` - Updated Display macro syntax (removed `fmt =` prefix) in: - `ansible_host.rs` - `ansible_port.rs` - `ssh_private_key_file.rs` All tests (1447 unit tests, 368 doc tests, E2E tests) pass successfully. ACKs for top commit: josecelano: ACK 846b509 Tree-SHA512: 42d67c9bc3a2661a47aa60b04ce9ae87e8702c0e8c72410e3df78c59c4451f5426e227082dc810ac828d9dae622b733d3cef00088698c63940e3823088cf11ee
2 parents 5aacf90 + 846b509 commit 18126be

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ tokio = { version = "1.0", features = [ "full" ] }
4545
anyhow = "1.0"
4646
chrono = { version = "0.4", features = [ "serde" ] }
4747
clap = { version = "4.0", features = [ "derive" ] }
48-
derive_more = "0.99"
48+
derive_more = { version = "2.1", features = [ "display", "from" ] }
4949
figment = { version = "0.10", features = [ "json" ] }
5050
parking_lot = "0.12"
5151
reqwest = "0.12"
@@ -55,8 +55,8 @@ serde = { version = "1.0", features = [ "derive" ] }
5555
serde_json = "1.0"
5656
tempfile = "3.0"
5757
tera = "1.0"
58-
testcontainers = { version = "0.25", features = [ "blocking" ] }
59-
thiserror = "1.0"
58+
testcontainers = { version = "0.26", features = [ "blocking" ] }
59+
thiserror = "2.0"
6060
torrust-dependency-installer = { path = "packages/dependency-installer" }
6161
torrust-linting = { path = "packages/linting" }
6262
tracing = { version = "0.1", features = [ "attributes" ] }
@@ -65,5 +65,5 @@ tracing-subscriber = { version = "0.3", features = [ "env-filter", "json", "fmt"
6565
uuid = { version = "1.0", features = [ "v4", "serde" ] }
6666

6767
[dev-dependencies]
68-
rstest = "0.23"
68+
rstest = "0.26"
6969
tracing-test = "0.2"

src/infrastructure/templating/ansible/template/wrappers/inventory/context/ansible_host.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub enum AnsibleHostError {
2424
///
2525
/// For this implementation, we only support IP addresses (IPv4 and IPv6) for simplicity.
2626
#[derive(Debug, Clone, PartialEq, Eq, Display, From, Serialize)]
27-
#[display(fmt = "{ip}")]
27+
#[display("{ip}")]
2828
#[serde(transparent)]
2929
pub struct AnsibleHost {
3030
ip: IpAddr,

src/infrastructure/templating/ansible/template/wrappers/inventory/context/ansible_port.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub enum AnsiblePortError {
2020
/// Ansible's `ansible_port` represents the SSH port to connect to.
2121
/// Valid port numbers are in the range 1-65535.
2222
#[derive(Debug, Clone, Copy, PartialEq, Eq, Display, From, Serialize)]
23-
#[display(fmt = "{port}")]
23+
#[display("{port}")]
2424
#[serde(transparent)]
2525
pub struct AnsiblePort {
2626
port: u16,

src/infrastructure/templating/ansible/template/wrappers/inventory/context/ssh_private_key_file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub enum SshPrivateKeyFileError {
1717

1818
/// Wrapper type for SSH private key file path using the newtype pattern
1919
#[derive(Debug, Clone, PartialEq, Eq, Display, From, Serialize)]
20-
#[display(fmt = "{}", "path.display()")]
20+
#[display("{}", path.display())]
2121
#[serde(transparent)]
2222
pub struct SshPrivateKeyFile {
2323
path: PathBuf,

0 commit comments

Comments
 (0)