From 63b76aa3ef1829dacb21b483dda6f54e62dc44e7 Mon Sep 17 00:00:00 2001 From: finga Date: Sat, 15 Oct 2022 02:03:28 +0200 Subject: [PATCH] Update CI, nightly, cargo --- .woodpecker.yml | 10 +++--- firmware/rust/Cargo.lock | 56 ++++++++++++++++++------------- firmware/rust/Cargo.toml | 1 - firmware/rust/rust-toolchain.toml | 2 +- 4 files changed, 39 insertions(+), 30 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 381e99c..42cad69 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,35 +1,35 @@ pipeline: fmt: group: default - image: rust_avr + image: rust_full commands: - cd firmware/rust/ - cargo fmt --all -- --check clippy: group: default - image: rust_avr + image: rust_full commands: - cd firmware/rust/ - cargo clippy --all-features doc: group: default - image: rust_avr + image: rust_full commands: - cd firmware/rust/ - cargo doc --all-features build: group: default - image: rust_avr + image: rust_full commands: - cd firmware/rust/ - cargo build --all-features build_release: group: default - image: rust_avr + image: rust_full commands: - cd firmware/rust/ - cargo build --all-features --release diff --git a/firmware/rust/Cargo.lock b/firmware/rust/Cargo.lock index 82a9dba..edbb1f4 100644 --- a/firmware/rust/Cargo.lock +++ b/firmware/rust/Cargo.lock @@ -1,9 +1,11 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "atmega-hal" version = "0.1.0" -source = "git+https://github.com/rahix/avr-hal?branch=main#e897783816437a677aa577ddfdaa34e9a1e86d96" +source = "git+https://github.com/rahix/avr-hal?branch=main#8e4ba8f2a097b28459e35528e9f3d89dcf2a6c39" dependencies = [ "avr-device", "avr-hal-generic", @@ -11,21 +13,22 @@ dependencies = [ [[package]] name = "avr-device" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb440a38bef22cef233b3eb46ef13e588eb8dcc70a1bdce3f00ebc6bf6b48dd" +checksum = "edb5cf74147f0a7ef4b7b2b5cdd6bc04e749d050cf48ed2a40048db290165db4" dependencies = [ "avr-device-macros", "bare-metal", "cfg-if", + "rustversion", "vcell", ] [[package]] name = "avr-device-macros" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c62997db86a92e73b68ab491d4379e1ddb12e94a9eb542180bc6b60f0e09f8b" +checksum = "474dda7ee758065593ae9fd53c9f95a38c1f7d44fac02a4d354838a6c40070d8" dependencies = [ "proc-macro2", "quote", @@ -35,13 +38,14 @@ dependencies = [ [[package]] name = "avr-hal-generic" version = "0.1.0" -source = "git+https://github.com/rahix/avr-hal?branch=main#e897783816437a677aa577ddfdaa34e9a1e86d96" +source = "git+https://github.com/rahix/avr-hal?branch=main#8e4ba8f2a097b28459e35528e9f3d89dcf2a6c39" dependencies = [ "avr-device", "cfg-if", "embedded-hal", "nb 0.1.3", "paste", + "rustversion", "ufmt", "void", ] @@ -112,9 +116,9 @@ checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812" [[package]] name = "paste" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" [[package]] name = "proc-macro-hack" @@ -124,18 +128,18 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.17" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ "proc-macro2", ] @@ -149,6 +153,12 @@ dependencies = [ "semver", ] +[[package]] +name = "rustversion" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" + [[package]] name = "semver" version = "0.9.0" @@ -176,20 +186,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.91" +version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "ufmt" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7ecea7ef79d3f8f878eee614afdf5256475c63ad76139d4da6125617c784a0" +checksum = "31d3c0c63312dfc9d8e5c71114d617018a19f6058674003c0da29ee8d8036cdd" dependencies = [ "proc-macro-hack", "ufmt-macros", @@ -198,9 +208,9 @@ dependencies = [ [[package]] name = "ufmt-macros" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed813e34a2bfa9dc58ee2ed8c8314d25e6d70c911486d64b8085cb695cfac069" +checksum = "e4ab6c92f30c996394a8bd525aef9f03ce01d0d7ac82d81902968057e37dd7d9" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -215,10 +225,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e87a2ed6b42ec5e28cc3b94c09982969e9227600b2e3dcbc1db927a84c06bd69" [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-ident" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "vcell" diff --git a/firmware/rust/Cargo.toml b/firmware/rust/Cargo.toml index 50a1fe9..6d6c0bd 100644 --- a/firmware/rust/Cargo.toml +++ b/firmware/rust/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "clock-generator" version = "0.1.0-dev" -authors = ["finga "] edition = "2018" license = "GPL-3.0-or-later" diff --git a/firmware/rust/rust-toolchain.toml b/firmware/rust/rust-toolchain.toml index 6616dd3..fc0b1fe 100644 --- a/firmware/rust/rust-toolchain.toml +++ b/firmware/rust/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2021-01-07" +channel = "nightly" components = [ "rust-src" ] profile = "minimal"