Migrate to 2021 edition

This commit is contained in:
Christian Duerr 2021-12-26 17:47:57 +01:00 committed by GitHub
parent 850fd1826b
commit f0934d8440
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 12 deletions

View File

@ -24,8 +24,8 @@ tasks:
cargo test cargo test
- oldstable: | - oldstable: |
cd alacritty cd alacritty
rustup toolchain install --profile minimal 1.53.0 rustup toolchain install --profile minimal 1.56.0
rustup default 1.53.0 rustup default 1.56.0
cargo test cargo test
- clippy: | - clippy: |
cd alacritty cd alacritty

View File

@ -27,8 +27,8 @@ tasks:
cargo +nightly fmt -- --check cargo +nightly fmt -- --check
- oldstable: | - oldstable: |
cd alacritty cd alacritty
rustup toolchain install --profile minimal 1.53.0 rustup toolchain install --profile minimal 1.56.0
rustup default 1.53.0 rustup default 1.56.0
cargo test cargo test
- clippy: | - clippy: |
cd alacritty cd alacritty

View File

@ -19,7 +19,7 @@ jobs:
run: cargo test run: cargo test
- name: Oldstable - name: Oldstable
run: | run: |
rustup default 1.53.0 rustup default 1.56.0
cargo test cargo test
- name: Clippy - name: Clippy
run: | run: |

View File

@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## 0.11.0-dev ## 0.11.0-dev
### Packaging
- Minimum Rust version has been bumped to 1.56.0
## 0.10.0 ## 0.10.0
### Packaging ### Packaging

View File

@ -42,7 +42,7 @@ and
[easy](https://github.com/alacritty/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22D+-+easy%22) [easy](https://github.com/alacritty/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22D+-+easy%22)
issues. issues.
Please note that the minimum supported version of Alacritty is Rust 1.53.0. All patches are expected Please note that the minimum supported version of Alacritty is Rust 1.56.0. All patches are expected
to work with the minimum supported version. to work with the minimum supported version.
Since `alacritty_terminal`'s version always tracks the next release, make sure that the version is Since `alacritty_terminal`'s version always tracks the next release, make sure that the version is

View File

@ -6,7 +6,8 @@ license = "Apache-2.0"
description = "A fast, cross-platform, OpenGL terminal emulator" description = "A fast, cross-platform, OpenGL terminal emulator"
readme = "README.md" readme = "README.md"
homepage = "https://github.com/alacritty/alacritty" homepage = "https://github.com/alacritty/alacritty"
edition = "2018" edition = "2021"
rust-version = "1.56.0"
[dependencies.alacritty_terminal] [dependencies.alacritty_terminal]
path = "../alacritty_terminal" path = "../alacritty_terminal"

View File

@ -5,7 +5,8 @@ authors = ["Christian Duerr <contact@christianduerr.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "Failure resistant deserialization derive" description = "Failure resistant deserialization derive"
homepage = "https://github.com/alacritty/alacritty" homepage = "https://github.com/alacritty/alacritty"
edition = "2018" edition = "2021"
rust-version = "1.56.0"
[lib] [lib]
proc-macro = true proc-macro = true

View File

@ -185,7 +185,7 @@ struct Attr {
} }
impl Parse for Attr { impl Parse for Attr {
fn parse(input: ParseStream) -> parse::Result<Self> { fn parse(input: ParseStream<'_>) -> parse::Result<Self> {
let ident = input.parse::<Ident>()?.to_string(); let ident = input.parse::<Ident>()?.to_string();
let param = input.parse::<Token![=]>().and_then(|_| input.parse()).ok(); let param = input.parse::<Token![=]>().and_then(|_| input.parse()).ok();
Ok(Self { ident, param }) Ok(Self { ident, param })

View File

@ -131,7 +131,7 @@ struct Logger {
} }
impl Log for Logger { impl Log for Logger {
fn log(&self, record: &Record) { fn log(&self, record: &Record<'_>) {
assert_eq!(record.target(), env!("CARGO_PKG_NAME")); assert_eq!(record.target(), env!("CARGO_PKG_NAME"));
match record.level() { match record.level() {
@ -147,7 +147,7 @@ impl Log for Logger {
} }
} }
fn enabled(&self, _metadata: &Metadata) -> bool { fn enabled(&self, _metadata: &Metadata<'_>) -> bool {
true true
} }

View File

@ -6,7 +6,8 @@ license = "Apache-2.0"
description = "Library for writing terminal emulators" description = "Library for writing terminal emulators"
readme = "../README.md" readme = "../README.md"
homepage = "https://github.com/alacritty/alacritty" homepage = "https://github.com/alacritty/alacritty"
edition = "2018" edition = "2021"
rust-version = "1.56.0"
[dependencies.alacritty_config_derive] [dependencies.alacritty_config_derive]
path = "../alacritty_config_derive" path = "../alacritty_config_derive"