Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a76cef2

Browse files
authoredNov 11, 2024
Merge pull request #122 from spaceapi-community/bump-msrv
Increase MSRV to 1.75
2 parents e4eef06 + 5c925dd commit a76cef2

File tree

6 files changed

+9
-19
lines changed

6 files changed

+9
-19
lines changed
 

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
build_and_test:
1010
runs-on: ubuntu-22.04
11-
container: rust:1.60
11+
container: rust:1.75
1212
steps:
1313
- uses: actions/checkout@v4
1414
- run: cargo build

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Possible log types:
1313

1414
### Unreleased
1515

16-
- [changed] Require at least Rust 1.60
16+
- [changed] Require at least Rust 1.75
1717

1818
### V0.9.0 (2023-05-07)
1919

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ include = [
2121
"AUTHORS.md",
2222
]
2323
edition = "2021"
24-
rust-version = "1.60"
24+
rust-version = "1.75"
2525

2626
[dependencies]
2727
log = "^0.4"

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ serialization and deserialization to/from JSON using Serde.
1111
- Crate Documentation: https://docs.rs/spaceapi/
1212
- SpaceAPI Documentation: https://spaceapi.io/pages/docs.html
1313

14-
This library requires Rust 1.60.0 or newer.
14+
This library requires Rust 1.75 or newer.
1515

1616

1717
## Usage

‎clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.60"
1+
msrv = "1.75"

‎src/status.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -197,23 +197,18 @@ pub struct Link {
197197
pub url: String,
198198
}
199199

200-
#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
200+
#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
201201
#[serde(rename_all = "snake_case")]
202202
pub enum BillingInterval {
203203
Yearly,
204+
#[default]
204205
Monthly,
205206
Weekly,
206207
Daily,
207208
Hourly,
208209
Other,
209210
}
210211

211-
impl Default for BillingInterval {
212-
fn default() -> Self {
213-
BillingInterval::Monthly
214-
}
215-
}
216-
217212
#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
218213
pub struct MembershipPlan {
219214
pub name: String,
@@ -310,19 +305,14 @@ impl Status {
310305
}
311306
}
312307

313-
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
308+
#[derive(Default, Debug, Copy, Clone, Eq, PartialEq)]
314309
enum StatusBuilderVersion {
310+
#[default]
315311
V0_13,
316312
V14,
317313
Mixed,
318314
}
319315

320-
impl Default for StatusBuilderVersion {
321-
fn default() -> StatusBuilderVersion {
322-
StatusBuilderVersion::V0_13
323-
}
324-
}
325-
326316
/// Builder for the `Status` object.
327317
#[derive(Default, Debug, Clone)]
328318
pub struct StatusBuilder {

0 commit comments

Comments
 (0)
Please sign in to comment.