summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Duerr <contact@christianduerr.com>2021-12-26 17:47:57 +0100
committerGitHub <noreply@github.com>2021-12-26 16:47:57 +0000
commitf0934d8440021b3762211d7cf0c26478dacee0dc (patch)
tree221ea3a4cbd4741950db9b29011c58f49e1ae27a
parent850fd1826b567c4c7cca66fd5ffe67c07ce6cc44 (diff)
Migrate to 2021 edition
-rw-r--r--.builds/freebsd.yml4
-rw-r--r--.builds/linux.yml4
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--CHANGELOG.md4
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--alacritty/Cargo.toml3
-rw-r--r--alacritty_config_derive/Cargo.toml3
-rw-r--r--alacritty_config_derive/src/de_struct.rs2
-rw-r--r--alacritty_config_derive/tests/config.rs4
-rw-r--r--alacritty_terminal/Cargo.toml3
10 files changed, 19 insertions, 12 deletions
diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index ba863a55..0f170802 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -24,8 +24,8 @@ tasks:
cargo test
- oldstable: |
cd alacritty
- rustup toolchain install --profile minimal 1.53.0
- rustup default 1.53.0
+ rustup toolchain install --profile minimal 1.56.0
+ rustup default 1.56.0
cargo test
- clippy: |
cd alacritty
diff --git a/.builds/linux.yml b/.builds/linux.yml
index c23375f5..8098051c 100644
--- a/.builds/linux.yml
+++ b/.builds/linux.yml
@@ -27,8 +27,8 @@ tasks:
cargo +nightly fmt -- --check
- oldstable: |
cd alacritty
- rustup toolchain install --profile minimal 1.53.0
- rustup default 1.53.0
+ rustup toolchain install --profile minimal 1.56.0
+ rustup default 1.56.0
cargo test
- clippy: |
cd alacritty
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65e8f277..ebf8fa58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
run: cargo test
- name: Oldstable
run: |
- rustup default 1.53.0
+ rustup default 1.56.0
cargo test
- name: Clippy
run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae379054..b3d738ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## 0.11.0-dev
+### Packaging
+
+- Minimum Rust version has been bumped to 1.56.0
+
## 0.10.0
### Packaging
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0d262082..4994597f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,7 +42,7 @@ and
[easy](https://github.com/alacritty/alacritty/issues?q=is%3Aopen+is%3Aissue+label%3A%22D+-+easy%22)
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.
Since `alacritty_terminal`'s version always tracks the next release, make sure that the version is
diff --git a/alacritty/Cargo.toml b/alacritty/Cargo.toml
index 01918377..d64f3d3f 100644
--- a/alacritty/Cargo.toml
+++ b/alacritty/Cargo.toml
@@ -6,7 +6,8 @@ license = "Apache-2.0"
description = "A fast, cross-platform, OpenGL terminal emulator"
readme = "README.md"
homepage = "https://github.com/alacritty/alacritty"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56.0"
[dependencies.alacritty_terminal]
path = "../alacritty_terminal"
diff --git a/alacritty_config_derive/Cargo.toml b/alacritty_config_derive/Cargo.toml
index 8d6d9c4b..afc6b227 100644
--- a/alacritty_config_derive/Cargo.toml
+++ b/alacritty_config_derive/Cargo.toml
@@ -5,7 +5,8 @@ authors = ["Christian Duerr <contact@christianduerr.com>"]
license = "MIT/Apache-2.0"
description = "Failure resistant deserialization derive"
homepage = "https://github.com/alacritty/alacritty"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56.0"
[lib]
proc-macro = true
diff --git a/alacritty_config_derive/src/de_struct.rs b/alacritty_config_derive/src/de_struct.rs
index 1325cae3..ceb32fd9 100644
--- a/alacritty_config_derive/src/de_struct.rs
+++ b/alacritty_config_derive/src/de_struct.rs
@@ -185,7 +185,7 @@ struct 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 param = input.parse::<Token![=]>().and_then(|_| input.parse()).ok();
Ok(Self { ident, param })
diff --git a/alacritty_config_derive/tests/config.rs b/alacritty_config_derive/tests/config.rs
index 6838a42e..58ad8bd4 100644
--- a/alacritty_config_derive/tests/config.rs
+++ b/alacritty_config_derive/tests/config.rs
@@ -131,7 +131,7 @@ struct Logger {
}
impl Log for Logger {
- fn log(&self, record: &Record) {
+ fn log(&self, record: &Record<'_>) {
assert_eq!(record.target(), env!("CARGO_PKG_NAME"));
match record.level() {
@@ -147,7 +147,7 @@ impl Log for Logger {
}
}
- fn enabled(&self, _metadata: &Metadata) -> bool {
+ fn enabled(&self, _metadata: &Metadata<'_>) -> bool {
true
}
diff --git a/alacritty_terminal/Cargo.toml b/alacritty_terminal/Cargo.toml
index bb2f5b33..be8d17dd 100644
--- a/alacritty_terminal/Cargo.toml
+++ b/alacritty_terminal/Cargo.toml
@@ -6,7 +6,8 @@ license = "Apache-2.0"
description = "Library for writing terminal emulators"
readme = "../README.md"
homepage = "https://github.com/alacritty/alacritty"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56.0"
[dependencies.alacritty_config_derive]
path = "../alacritty_config_derive"