Skip to content

Increase MSRV to 1.75 #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build_and_test:
runs-on: ubuntu-22.04
container: rust:1.60
container: rust:1.75
steps:
- uses: actions/checkout@v4
- run: cargo build
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Possible log types:

### Unreleased

- [changed] Require at least Rust 1.60
- [changed] Require at least Rust 1.75

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

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include = [
"AUTHORS.md",
]
edition = "2021"
rust-version = "1.60"
rust-version = "1.75"

[dependencies]
log = "^0.4"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ serialization and deserialization to/from JSON using Serde.
- Crate Documentation: https://docs.rs/spaceapi/
- SpaceAPI Documentation: https://spaceapi.io/pages/docs.html

This library requires Rust 1.60.0 or newer.
This library requires Rust 1.75 or newer.


## Usage
Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv = "1.60"
msrv = "1.75"
18 changes: 4 additions & 14 deletions src/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,23 +197,18 @@ pub struct Link {
pub url: String,
}

#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq, Eq)]
#[serde(rename_all = "snake_case")]
pub enum BillingInterval {
Yearly,
#[default]
Monthly,
Weekly,
Daily,
Hourly,
Other,
}

impl Default for BillingInterval {
fn default() -> Self {
BillingInterval::Monthly
}
}

#[derive(Serialize, Deserialize, Default, Debug, Clone, PartialEq)]
pub struct MembershipPlan {
pub name: String,
Expand Down Expand Up @@ -310,19 +305,14 @@ impl Status {
}
}

#[derive(Debug, Copy, Clone, Eq, PartialEq)]
#[derive(Default, Debug, Copy, Clone, Eq, PartialEq)]
enum StatusBuilderVersion {
#[default]
V0_13,
V14,
Mixed,
}

impl Default for StatusBuilderVersion {
fn default() -> StatusBuilderVersion {
StatusBuilderVersion::V0_13
}
}

/// Builder for the `Status` object.
#[derive(Default, Debug, Clone)]
pub struct StatusBuilder {
Expand Down