Upgrade to 1.67 Rust

- upgrade Cargo deps
instrumentisto · Jan 28, 2023 · 241d406 · 241d406 · tyranron · Jan 28, 2023
1 parent 4482bbc
commit 241d406
Show file tree

Hide file tree

Showing 20 changed files with 172 additions and 74 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -544,7 +544,7 @@ jobs:
       - name: Install linux dependencies
         run: |
           apt update
-          apt install -y curl xz-utils make clang
+          apt install -y clang curl make xz-utils
       - uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: stable
@@ -1033,7 +1033,8 @@ jobs:
                                ver=${{ steps.release.outputs.group2 }})"
              >> $GITHUB_OUTPUT
 
-      - uses: softprops/action-gh-release@v1
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v1
         with:
           name: ${{ steps.release.outputs.group1 }} ${{ steps.release.outputs.group2 }}
           body: |

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -56,7 +56,7 @@ tracerr = "0.3"
 url = "2.3"
 
 [target.'cfg(target_os = "android")'.dependencies]
-android_logger = "0.11"
+android_logger = "0.12"
 
 [target.'cfg(any(target_os = "ios", target_os = "linux", target_os = "macos", target_os = "windows"))'.dependencies]
 simple_logger = "4.0"

diff --git a/Makefile b/Makefile
@@ -20,11 +20,11 @@ IMAGE_NAME := $(strip \
 	$(if $(call eq,$(image),medea-demo-edge),medea-demo,\
 	$(or $(image),medea-control-api-mock)))
 
-RUST_VER := 1.66
+RUST_VER := 1.67
 CHROME_VERSION := 104.0
 FIREFOX_VERSION := 107.0.1-driver0.32.0
 
-CARGO_NDK_VER := 2.8.0-ndkr23b-rust$(RUST_VER)
+CARGO_NDK_VER := 2.12.4-ndkr23b-rust$(RUST_VER)
 ANDROID_TARGETS := aarch64-linux-android \
                    armv7-linux-androideabi \
                    i686-linux-android \

diff --git a/crates/medea-macro/src/caused.rs b/crates/medea-macro/src/caused.rs
@@ -16,9 +16,8 @@ use synstructure::{BindStyle, Structure};
 ///     - otherwise returns `None`.
 /// 3. Generate implementation of `Caused` trait for this enum with generated
 ///    methods from step 1 and 2.
-#[allow(clippy::needless_pass_by_value)]
-pub(crate) fn derive(mut s: Structure<'_>) -> Result<TokenStream> {
-    let error_type = error_type(&s)?;
+pub(crate) fn derive(s: &mut Structure<'_>) -> Result<TokenStream> {
+    let error_type = error_type(s)?;
 
     let cause_body = s.bind_with(|_| BindStyle::Move).each_variant(|v| {
         v.bindings().iter().find(|&bi| is_caused(bi)).map_or_else(