summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDidier Wenzek <didier.wenzek@acidalie.com>2022-08-18 16:50:30 +0200
committerGitHub <noreply@github.com>2022-08-18 16:50:30 +0200
commit2674bf398ba98ae60142fc22e8a7f857a1d8069b (patch)
tree0e3c5983ff66505c6e562d1af38dfb774872777f
parent7e6740e02a09815c405e8b900f0ac862ecd7acba (diff)
parentd4a8a3128a86e92e71dd24d8d79bcfb9404f0a4f (diff)
Merge pull request #1297 from matthiasbeyer/update-rustc
Update rustc: 1.58.1 -> 1.63.0
-rw-r--r--.github/workflows/build-workflow.yml4
-rw-r--r--.github/workflows/ci_pipeline.yml4
-rw-r--r--.github/workflows/hosted-post-merge_version_update.yml2
-rw-r--r--.github/workflows/pull-request-checks.yml18
-rw-r--r--.github/workflows/update-tedge-ref-docs.yml12
-rw-r--r--crates/common/mqtt_channel/src/messages.rs2
6 files changed, 21 insertions, 21 deletions
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
index d45936bd..f1ff16aa 100644
--- a/.github/workflows/build-workflow.yml
+++ b/.github/workflows/build-workflow.yml
@@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v3
- name: Enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
- name: Enable cache
# https://github.com/marketplace/actions/rust-cache
@@ -55,7 +55,7 @@ jobs:
uses: actions/checkout@v3
- name: Enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
with:
targets: ${{ matrix.target }}
diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml
index da164d16..b5265197 100644
--- a/.github/workflows/ci_pipeline.yml
+++ b/.github/workflows/ci_pipeline.yml
@@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v3
- name: Enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
- name: Enable cache
# https://github.com/marketplace/actions/rust-cache
@@ -88,7 +88,7 @@ jobs:
uses: actions/checkout@v3
- name: Enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
with:
targets: ${{ matrix.target }}
diff --git a/.github/workflows/hosted-post-merge_version_update.yml b/.github/workflows/hosted-post-merge_version_update.yml
index af90319a..48430697 100644
--- a/.github/workflows/hosted-post-merge_version_update.yml
+++ b/.github/workflows/hosted-post-merge_version_update.yml
@@ -20,7 +20,7 @@ jobs:
- name: enable toolchain via github action
uses: actions-rs/toolchain@v1
with:
- toolchain: 1.58.1
+ toolchain: 1.63.0
components: cargo
override: true
diff --git a/.github/workflows/pull-request-checks.yml b/.github/workflows/pull-request-checks.yml
index 3c562282..e69fb710 100644
--- a/.github/workflows/pull-request-checks.yml
+++ b/.github/workflows/pull-request-checks.yml
@@ -168,7 +168,7 @@ jobs:
uses: actions/checkout@v3
- name: enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
with:
components: rustfmt, clippy
@@ -180,7 +180,7 @@ jobs:
uses: actions-rs/cargo@v1
# https://github.com/marketplace/actions/rust-cargo
with:
- toolchain: 1.58.1
+ toolchain: 1.63.0
command: clippy
args: --version
@@ -188,7 +188,7 @@ jobs:
uses: actions-rs/cargo@v1
# https://github.com/marketplace/actions/rust-cargo
with:
- toolchain: 1.58.1
+ toolchain: 1.63.0
command: clippy
args: --all-features
@@ -220,7 +220,7 @@ jobs:
uses: actions/checkout@v3
- name: enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
- name: Enable cache
# https://github.com/marketplace/actions/rust-cache
@@ -258,7 +258,7 @@ jobs:
uses: actions/checkout@v3
- name: enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
- name: Enable cache
# https://github.com/marketplace/actions/rust-cache
@@ -289,7 +289,7 @@ jobs:
uses: actions/checkout@v3
- name: enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
with:
targets: armv7-unknown-linux-gnueabihf
@@ -317,7 +317,7 @@ jobs:
uses: actions/checkout@v3
- name: enable toolchain via github action
- uses: dtolnay/rust-toolchain@1.58.1
+ uses: dtolnay/rust-toolchain@1.63.0
with:
target: armv7-unknown-linux-gnueabihf
@@ -342,8 +342,8 @@ jobs:
# - name: Checkout
# uses: actions/checkout@v3
#
-# - name: Install rust v1.58.1
-# uses: dtolnay/rust-toolchain@1.58.1
+# - name: Install rust v1.63.0
+# uses: dtolnay/rust-toolchain@1.63.0
#
# - name: Enable cache
# # https://github.com/marketplace/actions/rust-cache
diff --git a/.github/workflows/update-tedge-ref-docs.yml b/.github/workflows/update-tedge-ref-docs.yml
index 2f37f29e..a644339c 100644
--- a/.github/workflows/update-tedge-ref-docs.yml
+++ b/.github/workflows/update-tedge-ref-docs.yml
@@ -6,36 +6,36 @@ on:
# runs automatically on 00:00 UTC on 1st of every month
schedule:
- cron: "0 0 1 * *"
-
+
jobs:
build-tedge-create-ref-docs:
runs-on: Ubuntu-20.04
-
+
steps:
- name: Checkout
uses: actions/checkout@v3
- run: |
git config --global user.email "info@thin-edge.io"
git config --global user.name "Versioneer"
-
+
- name: enable toolchain via github action
# https://github.com/actions-rs/toolchain
uses: actions-rs/toolchain@v1
with:
- toolchain: 1.58.1
+ toolchain: 1.63.0
override: true
- name: Enable cache
# https://github.com/marketplace/actions/rust-cache
uses: Swatinem/rust-cache@v1
-
+
- name: Build tedge
uses: actions-rs/cargo@v1
# https://github.com/marketplace/actions/rust-cargo
with:
command: build
args: --release -p tedge
-
+
- name: run the update script
run: ./docs/gen-ref-docs.sh
- name: Create Pull Request
diff --git a/crates/common/mqtt_channel/src/messages.rs b/crates/common/mqtt_channel/src/messages.rs
index db5813f8..0c4c3fb9 100644
--- a/crates/common/mqtt_channel/src/messages.rs
+++ b/crates/common/mqtt_channel/src/messages.rs
@@ -48,7 +48,7 @@ impl Message {
pub fn payload_bytes(&self) -> &[u8] {
self.payload
.strip_suffix(&[0])
- .unwrap_or_else(|| self.payload.as_slice())
+ .unwrap_or(self.payload.as_slice())
}
}