Skip to content

Commit ff54477

Browse files
committed
cargo fmt
1 parent 2fbf841 commit ff54477

3 files changed

Lines changed: 16 additions & 12 deletions

File tree

zenoh-flat-jni/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fn main() {
1818
// delivered through the per-call `onError` callback (no Rust-side JVM throw).
1919
// `ZZenohId` stays a `value_blob` (`@JvmInline value class`).
2020
let jni = JniGen::new()
21-
.handle_locks(true) // Enable handle locks (default, thread-safe)
21+
.handle_locks(true) // Enable handle locks (default, thread-safe)
2222
.source_module(pq!(zenoh_flat)) // how to prefix prebindgen-marked items (functions, types
2323
.package_prefix("io.zenoh.jni") // the package of the generated JNI bindings
2424
// Error model: zenoh's native `ZError` is the `E` of every fallible

zenoh-flat-jni/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Generated `kotlin_enum` decoders use bare type idents (e.g. `WhatAmI`)
22
// matching the wrapper fn's `v: <ident>` signature. Bring upstream
33
// enums into scope so those decoders resolve at the include site.
4-
use zenoh_flat::WhatAmI;
5-
use zenoh_flat::SetIntersectionLevel;
64
use zenoh_flat::CongestionControl;
5+
use zenoh_flat::ConsolidationMode;
76
use zenoh_flat::Priority;
7+
use zenoh_flat::QueryTarget;
88
use zenoh_flat::Reliability;
99
use zenoh_flat::ReplyKeyExpr;
10-
use zenoh_flat::QueryTarget;
11-
use zenoh_flat::ConsolidationMode;
1210
use zenoh_flat::SampleKind;
11+
use zenoh_flat::SetIntersectionLevel;
12+
use zenoh_flat::WhatAmI;
1313

1414
// Generated by build.rs into OUT_DIR.
1515
include!(concat!(env!("OUT_DIR"), "/zenoh_flat_jni.rs"));

zenoh-flat-jni/src/zbytes.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ fn serialize(
302302
serializer.serialize(bytes);
303303
}
304304
JavaType::List(kotlin_type) => {
305-
let jlist: JList<'_, '_, '_> =
306-
JList::from_env(env, &any).map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
305+
let jlist: JList<'_, '_, '_> = JList::from_env(env, &any)
306+
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
307307
let mut iterator = jlist
308308
.iter(env)
309309
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
@@ -319,7 +319,8 @@ fn serialize(
319319
}
320320
}
321321
JavaType::Map(key_type, value_type) => {
322-
let jmap = JMap::from_env(env, &any).map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
322+
let jmap = JMap::from_env(env, &any)
323+
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
323324

324325
let map_size = env
325326
.call_method(&jmap, "size", "()I", &[])
@@ -360,7 +361,9 @@ pub extern "C" fn Java_io_zenoh_jni_bytes_JNIBytes_deserializeViaJNI(
360361
let jtype = decode_token_type(&mut env, jtype)?;
361362
let obj = deserialize(&mut env, &mut deserializer, &jtype)?;
362363
if !deserializer.done() {
363-
return Err(JniBindingError::<()>::JniError(ZDeserializeError.to_string()));
364+
return Err(JniBindingError::<()>::JniError(
365+
ZDeserializeError.to_string(),
366+
));
364367
}
365368
Ok(obj)
366369
}()
@@ -466,8 +469,8 @@ fn deserialize(
466469
let array_list = env
467470
.new_object("java/util/ArrayList", "()V", &[])
468471
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
469-
let jlist =
470-
JList::from_env(env, &array_list).map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
472+
let jlist = JList::from_env(env, &array_list)
473+
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
471474

472475
for _ in 0..list_size {
473476
let item = deserialize(env, deserializer, kotlin_type)?;
@@ -486,7 +489,8 @@ fn deserialize(
486489
let map = env
487490
.new_object("java/util/HashMap", "()V", &[])
488491
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
489-
let jmap = JMap::from_env(env, &map).map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
492+
let jmap = JMap::from_env(env, &map)
493+
.map_err(|err| JniBindingError::<()>::JniError(err.to_string()))?;
490494

491495
for _ in 0..map_size {
492496
let key = deserialize(env, deserializer, key_type)?;

0 commit comments

Comments
 (0)