Skip to content

Commit

Permalink
Merge pull request #1453 from jlebon/pr/bump-rust-clap
Browse files Browse the repository at this point in the history
Cargo.toml: bump MSRV to 1.75.0
  • Loading branch information
travier authored Apr 18, 2024
2 parents cff7a51 + 254d97e commit 331b2ec
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
CARGO_TERM_COLOR: always
RUST_BACKTRACE: 1
# Pinned toolchain for linting
ACTIONS_LINTS_TOOLCHAIN: 1.71.0
ACTIONS_LINTS_TOOLCHAIN: 1.77.2

defaults:
run:
Expand Down
30 changes: 18 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "coreos-installer"
repository = "https://github.com/coreos/coreos-installer"
license = "Apache-2.0"
edition = "2021"
rust-version = "1.70.0"
rust-version = "1.75.0"
exclude = ["/.cci.jenkinsfile", "/.github", "/.gitignore", "/Dockerfile"]
authors = [ "Benjamin Gilbert <[email protected]>" ]
description = "Installer for Fedora CoreOS and RHEL CoreOS"
Expand Down Expand Up @@ -52,7 +52,7 @@ base64 = ">= 0.21, < 0.22"
bincode = "^1.3"
bytes = ">= 1.0.1, < 2"
byte-unit = ">= 3.1.0, < 5.0.0"
clap = { version = ">= 4.1, < 4.5", default-features = false, features = ["std", "cargo", "derive", "error-context", "help", "suggestions", "usage", "wrap_help"] }
clap = { version = ">= 4.1, < 5", default-features = false, features = ["std", "cargo", "derive", "error-context", "help", "suggestions", "usage", "wrap_help"] }
clap_mangen = { version = "0.2", optional = true }
cpio = ">= 0.2.1, < 0.3"
flate2 = "^1.0"
Expand Down
1 change: 1 addition & 0 deletions docs/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Internal changes:

Packaging changes:

- Require Rust ≥ 1.75.0
- Update packit's downstream targets to be `fedora-all`


Expand Down
1 change: 1 addition & 0 deletions src/bin/rdcore/kargs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ fn modify_and_print(config: &KargsConfig, orig_options: &str) -> Result<Option<S
std::fs::OpenOptions::new()
.write(true)
.create(true)
.truncate(true)
.open(path)
.with_context(|| format!("creating {path}"))?;
}
Expand Down
2 changes: 1 addition & 1 deletion src/io/tee.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ mod tests {
fn tee_reader() {
const COUNT: usize = 100;
let src: Vec<u8> = (0..COUNT as u8).collect();
let mut buf = vec![0; 2 * COUNT];
let mut buf = [0; 2 * COUNT];
let mut off = 0;
let mut tee = TeeReader::new(&*src, Vec::new());
for i in 2.. {
Expand Down

0 comments on commit 331b2ec

Please sign in to comment.