From 883442f2adaed3aece0ecbdeab71eeecc731cb1e Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Wed, 28 Jun 2023 17:44:05 +0200
Subject: [PATCH] Switch to bender CI

---
 .github/ci/build.sh          | 16 ++++++++++++++++
 .github/workflows/rust.yml   | 26 --------------------------
 rust-toolchain.toml          |  3 +++
 stm32-data-gen/src/memory.rs |  4 +++-
 4 files changed, 22 insertions(+), 27 deletions(-)
 create mode 100755 .github/ci/build.sh
 delete mode 100644 .github/workflows/rust.yml
 create mode 100644 rust-toolchain.toml

diff --git a/.github/ci/build.sh b/.github/ci/build.sh
new file mode 100755
index 0000000..bdf7490
--- /dev/null
+++ b/.github/ci/build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+## on push branch~=gh-readonly-queue/main/.*
+## on pull_request
+
+set -euo pipefail
+
+export RUSTUP_HOME=/ci/cache/rustup
+export CARGO_HOME=/ci/cache/cargo
+export CARGO_TARGET_DIR=/ci/cache/target
+
+hashtime restore /ci/cache/filetime.json || true
+hashtime save /ci/cache/filetime.json
+
+cargo fmt -- --check
+
+./d ci
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
deleted file mode 100644
index 458918d..0000000
--- a/.github/workflows/rust.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Rust
-
-on:
-  push:
-    branches: [main, new-repo-layout]
-  pull_request:
-    branches: [main]
-  merge_group:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
-      - name: Check fmt
-        run: cargo fmt -- --check
-      - name: Build
-        run: ./d ci
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..6dc1587
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,3 @@
+[toolchain]
+channel = "nightly-2023-05-18"
+components = [ "rust-src", "rustfmt" ]
diff --git a/stm32-data-gen/src/memory.rs b/stm32-data-gen/src/memory.rs
index fa4e505..ae2ee6e 100644
--- a/stm32-data-gen/src/memory.rs
+++ b/stm32-data-gen/src/memory.rs
@@ -1,4 +1,6 @@
-use std::{cmp::Ordering, collections::HashMap, fs};
+use std::cmp::Ordering;
+use std::collections::HashMap;
+use std::fs;
 
 #[derive(Debug, PartialEq)]
 pub struct Memory {