Migration to jni 0.21.1: Fix

giovanniberti · Mar 30, 2024 · edc9e77 · edc9e77
1 parent 0d8e74c
commit edc9e77
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/robusta-codegen/src/transformation/exported.rs b/robusta-codegen/src/transformation/exported.rs
@@ -246,7 +246,7 @@ impl<'ctx> Fold for ExternJNIMethodTransformer<'ctx> {
 
         sig.inputs = {
             let mut res = Punctuated::new();
-            res.push(parse_quote!(env: ::robusta_jni::jni::JNIEnv<'env>));
+            res.push(parse_quote!(mut env: ::robusta_jni::jni::JNIEnv<'env>));
 
             if !is_self_method(&node) {
                 res.push(parse_quote!(class: ::robusta_jni::jni::objects::JClass));

diff --git a/robusta-codegen/src/transformation/imported.rs b/robusta-codegen/src/transformation/imported.rs
@@ -302,8 +302,10 @@ impl<'ctx> Fold for ImportedMethodTransformer<'ctx> {
                             }
                         } else {
                             quote_spanned! { output_type_span =>
-                                ::std::convert::TryInto::try_into(::robusta_jni::convert::JValueOwnedWrapper::from(res))
-                                   .and_then(|v| ::robusta_jni::convert::TryFromJavaValue::try_from(v, env))
+                                ::robusta_jni::convert::TryFromJavaValue::try_from(
+                                    ::std::convert::TryInto::try_into(::robusta_jni::convert::JValueOwnedWrapper::from(res))?,
+                                    env
+                                )
                             }
                         }
                     }