Skip to content

Commit 69365ed

Browse files
Bump MSRV to v1.69
1 parent bb57f17 commit 69365ed

File tree

5 files changed

+11
-34
lines changed

5 files changed

+11
-34
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,23 @@ jobs:
5252
disable_extra_builds: true
5353
disable_tests: true
5454
target: aarch64-apple-darwin
55-
toolchain: "1.59.0"
55+
toolchain: "1.69.0"
5656

5757
msrv-arm-linux-androideabi:
5858
uses: ./.github/workflows/build.yaml
5959
with:
6060
disable_extra_builds: true
6161
disable_tests: true
6262
target: arm-linux-androideabi
63-
toolchain: "1.59.0"
63+
toolchain: "1.69.0"
6464

6565
msrv-x86_64-unknown-freebsd:
6666
uses: ./.github/workflows/build.yaml
6767
with:
6868
disable_extra_builds: true
6969
disable_tests: true
7070
target: x86_64-unknown-freebsd
71-
toolchain: "1.59.0"
71+
toolchain: "1.69.0"
7272

7373
msrv-x86_64-unknown-linux-gnu:
7474
uses: ./.github/workflows/build.yaml
@@ -77,7 +77,7 @@ jobs:
7777
disable_tests: true
7878
extra_packages: libudev-dev
7979
target: x86_64-unknown-linux-gnu
80-
toolchain: "1.59.0"
80+
toolchain: "1.69.0"
8181

8282
msrv-x86_64-unknown-linux-musl:
8383
uses: ./.github/workflows/build.yaml
@@ -86,7 +86,7 @@ jobs:
8686
disable_tests: true
8787
extra_packages: gcc-aarch64-linux-gnu
8888
target: aarch64-unknown-linux-musl
89-
toolchain: "1.59.0"
89+
toolchain: "1.69.0"
9090

9191
msrv-x86_64-pc-windows-msvc:
9292
uses: ./.github/workflows/build.yaml
@@ -95,15 +95,15 @@ jobs:
9595
disable_tests: true
9696
runs_on: windows-2019
9797
target: x86_64-pc-windows-msvc
98-
toolchain: "1.59.0"
98+
toolchain: "1.69.0"
9999

100100
msrv-x86_64-unknown-netbsd:
101101
uses: ./.github/workflows/build.yaml
102102
with:
103103
disable_extra_builds: true
104104
disable_tests: true
105105
target: x86_64-unknown-netbsd
106-
toolchain: "1.59.0"
106+
toolchain: "1.69.0"
107107

108108
# --------------------------------------------------------------------------
109109
# Semantic Versioning

Cargo.toml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = [
66
"Jesse Braham <[email protected]>",
77
]
88
edition = "2021"
9-
rust-version = "1.59.0"
9+
rust-version = "1.69.0"
1010
description = "A cross-platform low-level serial port library."
1111
documentation = "https://docs.rs/serialport"
1212
repository = "https://github.com/serialport/serialport-rs"
@@ -44,21 +44,10 @@ serde = { version = "1.0", features = ["derive"], optional = true }
4444
assert_hex = "0.4.1"
4545
clap = { version = "3.1.6", features = ["derive"] }
4646
envconfig = "0.10.0"
47-
# TODES Remove pinning this subdependency (of clap) when we are bumping our
48-
# MSRV (libc raised its MSRV with a patch release 0.2.167 from 1.19.0 to
49-
# 1.63.0). Trick the resolver into picking a compatible release of libc by
50-
# adding it as a direct dependency meanwhile.
51-
libc = ">=0.2.0, <=0.2.163"
52-
# TODO: Remove pinning this subdependency of clap when we are bumping our MSRV.
53-
# (There has been an incompatible change with the MSRV of os_str_bytes with
54-
# 6.6.0) Until then we are tricking the dependency resolver into using a
55-
# compatible version by adding it as a direct dependency here.
56-
os_str_bytes = ">=6.0, <6.6.0"
5747
quickcheck = "1.0.3"
5848
quickcheck_macros = "1.0.0"
5949
rstest = { version = "0.12.0", default-features = false }
6050
rstest_reuse = "0.6.0"
61-
rustversion = "1.0.16"
6251

6352
[features]
6453
default = ["libudev"]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![crates.io version badge](https://img.shields.io/crates/v/serialport.svg)](https://crates.io/crates/serialport)
22
[![Documentation](https://docs.rs/serialport/badge.svg)](https://docs.rs/serialport)
33
[![GitHub workflow status](https://img.shields.io/github/actions/workflow/status/serialport/serialport-rs/ci.yaml?branch=main&logo=github)](https://github.com/serialport/serialport-rs/actions)
4-
[![Minimum Stable Rust Version](https://img.shields.io/badge/Rust-1.59.0-blue?logo=rust)](https://blog.rust-lang.org/2022/02/24/Rust-1.59.0.html)
4+
[![Minimum Stable Rust Version](https://img.shields.io/badge/Rust-1.69.0-blue?logo=rust)](https://blog.rust-lang.org/2023/04/20/Rust-1.69.0/)
55

66
# Introduction
77

@@ -105,7 +105,7 @@ can help debug software or hardware errors.
105105

106106
# Dependencies
107107

108-
Rust versions 1.59.0 and higher are supported by the library itself. There are
108+
Rust versions 1.69.0 and higher are supported by the library itself. There are
109109
examples requiring newer versions of Rust.
110110

111111
For GNU/Linux `pkg-config` headers are required:

examples/loopback.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,16 +193,6 @@ fn loopback_standard<'a>(
193193
}
194194
}
195195

196-
#[rustversion::before(1.63)]
197-
fn loopback_split<'a>(
198-
_port: &mut Box<dyn SerialPort>,
199-
_read_stats: &mut Stats<'a>,
200-
_write_stats: &mut Stats<'a>,
201-
) {
202-
unimplemented!("requires Rust 1.63 or later");
203-
}
204-
205-
#[rustversion::since(1.63)]
206196
fn loopback_split<'a>(
207197
port: &mut Box<dyn SerialPort>,
208198
read_stats: &mut Stats<'a>,

src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,9 @@ pub struct SerialPortBuilder {
337337

338338
impl SerialPortBuilder {
339339
/// Set the path to the serial port
340-
// TODO: Switch to `clone_into` when bumping our MSRV past 1.63 and remove this exemption.
341-
#[allow(clippy::assigning_clones)]
342340
#[must_use]
343341
pub fn path<'a>(mut self, path: impl Into<std::borrow::Cow<'a, str>>) -> Self {
344-
self.path = path.into().as_ref().to_owned();
342+
self.path = path.into().into_owned();
345343
self
346344
}
347345

0 commit comments

Comments
 (0)