Skip to content

Commit

Permalink
Fix build with new nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
ia0 committed Mar 2, 2024
1 parent f4c8493 commit 69fb62e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
ubuntu:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: rustup install nightly
- run: rustup component add --toolchain=nightly clippy miri rustfmt
- name: cd lib && cargo +nightly fmt -- --check
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: rustup install nightly
- name: cd lib && cargo +nightly build
run: cargo +nightly build
Expand Down
1 change: 1 addition & 0 deletions lib/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@
#![warn(unused_results)]
#![allow(unused_unsafe)] // TODO(msrv)
#![warn(clippy::pedantic)]
#![allow(clippy::doc_markdown)]
#![allow(clippy::enum_glob_use)]
#![allow(clippy::similar_names)]
#![allow(clippy::uninlined_format_args)] // TODO(msrv)
Expand Down
7 changes: 3 additions & 4 deletions xtask/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#![feature(slice_group_by)]
#![feature(iter_intersperse)]

use std::borrow::Cow;
Expand Down Expand Up @@ -380,14 +379,14 @@ impl Flags {
},
jobs: BTreeMap::new(),
};
for actions in actions.group_by(|x, y| x.os == y.os) {
for actions in actions.chunk_by(|x, y| x.os == y.os) {
let mut job =
WorkflowJob { runs_on: format!("{}-latest", actions[0].os), steps: vec![] };
job.steps.push(WorkflowStep {
uses: Some("actions/checkout@v3".to_owned()),
uses: Some("actions/checkout@v4".to_owned()),
..Default::default()
});
for actions in actions.group_by(|x, y| x.toolchain == y.toolchain) {
for actions in actions.chunk_by(|x, y| x.toolchain == y.toolchain) {
job.steps.push(WorkflowStep {
run: Some(format!("rustup install {}", actions[0].toolchain)),
..Default::default()
Expand Down

0 comments on commit 69fb62e

Please sign in to comment.