Skip to content

Commit a671dec

Browse files
milyinmilyin
committed
cargo fmt
1 parent 705a230 commit a671dec

9 files changed

Lines changed: 61 additions & 59 deletions

File tree

‎zenoh-jni/build.rs‎

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,43 +22,47 @@ fn main() {
2222
.jni_class_path("Java_io_zenoh_jni_JNINative")
2323
.jni_method_suffix("ViaJNI")
2424
.kotlin_callback_package("io.zenoh.jni.callbacks")
25-
.kotlin_callback_dir(
26-
"../zenoh-jni-runtime/src/commonMain/kotlin/io/zenoh/jni/callbacks",
27-
)
28-
25+
.kotlin_callback_dir("../zenoh-jni-runtime/src/commonMain/kotlin/io/zenoh/jni/callbacks")
2926
// ── Opaque handles — `opaque_handle` configures: jlong wire
3027
// (input + output), `Box::into_raw`/`Box::from_raw` lifecycle,
3128
// `instanceof` dispatch class, and the Kotlin parameter-type
3229
// name. The Kotlin `.kt` file is assumed to be hand-maintained
3330
// by default; chain `.with_methods(...)` (auto-generated class
3431
// with promoted instance methods) or `.emit_kotlin_class()`
3532
// (auto-generated shell class) to switch to auto-emission.
36-
.opaque_handle("Session", "io.zenoh.jni.JNISession")
37-
.opaque_handle("Config", "io.zenoh.jni.JNIConfig")
38-
.opaque_handle("ZKeyExpr<'static>", "io.zenoh.jni.JNIKeyExpr")
39-
.opaque_handle("Publisher<'static>", "io.zenoh.jni.JNIPublisher")
40-
.with_methods(["put_publisher", "delete_publisher"])
41-
.opaque_handle("Subscriber<()>", "io.zenoh.jni.JNISubscriber")
42-
.emit_kotlin_class()
43-
.opaque_handle("Querier<'static>", "io.zenoh.jni.JNIQuerier")
44-
.opaque_handle("Queryable<()>", "io.zenoh.jni.JNIQueryable")
45-
.emit_kotlin_class()
46-
.opaque_handle("AdvancedSubscriber<()>", "io.zenoh.jni.JNIAdvancedSubscriber")
47-
.opaque_handle("AdvancedPublisher<'static>", "io.zenoh.jni.JNIAdvancedPublisher")
48-
.opaque_handle("MatchingListener", "io.zenoh.jni.JNIMatchingListener")
49-
.emit_kotlin_class()
50-
.opaque_handle("SampleMissListener", "io.zenoh.jni.JNISampleMissListener")
51-
.emit_kotlin_class()
52-
33+
.opaque_handle("Session", "io.zenoh.jni.JNISession")
34+
.opaque_handle("Config", "io.zenoh.jni.JNIConfig")
35+
.opaque_handle("ZKeyExpr<'static>", "io.zenoh.jni.JNIKeyExpr")
36+
.opaque_handle("Publisher<'static>", "io.zenoh.jni.JNIPublisher")
37+
.with_methods(["put_publisher", "delete_publisher"])
38+
.opaque_handle("Subscriber<()>", "io.zenoh.jni.JNISubscriber")
39+
.emit_kotlin_class()
40+
.opaque_handle("Querier<'static>", "io.zenoh.jni.JNIQuerier")
41+
.opaque_handle("Queryable<()>", "io.zenoh.jni.JNIQueryable")
42+
.emit_kotlin_class()
43+
.opaque_handle(
44+
"AdvancedSubscriber<()>",
45+
"io.zenoh.jni.JNIAdvancedSubscriber",
46+
)
47+
.opaque_handle(
48+
"AdvancedPublisher<'static>",
49+
"io.zenoh.jni.JNIAdvancedPublisher",
50+
)
51+
.opaque_handle("MatchingListener", "io.zenoh.jni.JNIMatchingListener")
52+
.emit_kotlin_class()
53+
.opaque_handle("SampleMissListener", "io.zenoh.jni.JNISampleMissListener")
54+
.emit_kotlin_class()
5355
// ── jint-encoded enums — sugar over `input_decoder` for the
5456
// common `jint → enum` pattern.
55-
.jint_enum("CongestionControl", "crate::utils::decode_congestion_control")
56-
.jint_enum("Priority", "crate::utils::decode_priority")
57-
.jint_enum("Reliability", "crate::utils::decode_reliability")
58-
.jint_enum("QueryTarget", "crate::utils::decode_query_target")
57+
.jint_enum(
58+
"CongestionControl",
59+
"crate::utils::decode_congestion_control",
60+
)
61+
.jint_enum("Priority", "crate::utils::decode_priority")
62+
.jint_enum("Reliability", "crate::utils::decode_reliability")
63+
.jint_enum("QueryTarget", "crate::utils::decode_query_target")
5964
.jint_enum("ConsolidationMode", "crate::utils::decode_consolidation")
60-
.jint_enum("ReplyKeyExpr", "crate::utils::decode_reply_key_expr")
61-
65+
.jint_enum("ReplyKeyExpr", "crate::utils::decode_reply_key_expr")
6266
// ── Value-shaped custom converters.
6367
.input_decoder(
6468
"Encoding",
@@ -85,7 +89,6 @@ fn main() {
8589
"jni::sys::jobject",
8690
"crate::zenoh_id::zenoh_ids_to_java_list(env, v)?",
8791
)
88-
8992
// ── Manual callback overrides — replaces the auto-generated
9093
// `process_kotlin_*_callback` dispatcher with a hand-written
9194
// one and reroutes the Kotlin FQN.
@@ -103,7 +106,6 @@ fn main() {
103106
"impl Fn() + Send + Sync + 'static",
104107
"io.zenoh.jni.callbacks.JNIOnCloseCallback",
105108
)
106-
107109
// ── Kotlin type names for value types that have automatic JNI
108110
// converters (data classes, primitive aliases, callback param
109111
// types whose Kotlin form is hand-maintained).
@@ -139,7 +141,10 @@ fn main() {
139141
.kotlin_value_type("HistoryConfig", "io.zenoh.jni.HistoryConfig")
140142
.kotlin_value_type("CacheConfig", "io.zenoh.jni.CacheConfig")
141143
.kotlin_value_type("RecoveryConfig", "io.zenoh.jni.RecoveryConfig")
142-
.kotlin_value_type("Option<MissDetectionConfig>", "io.zenoh.jni.MissDetectionConfig")
144+
.kotlin_value_type(
145+
"Option<MissDetectionConfig>",
146+
"io.zenoh.jni.MissDetectionConfig",
147+
)
143148
.kotlin_value_type("Option<HistoryConfig>", "io.zenoh.jni.HistoryConfig")
144149
.kotlin_value_type("Option<CacheConfig>", "io.zenoh.jni.CacheConfig")
145150
.kotlin_value_type("Option<RecoveryConfig>", "io.zenoh.jni.RecoveryConfig")
@@ -149,7 +154,6 @@ fn main() {
149154
// compile, so we point them at `kotlin.Any`).
150155
.kotlin_value_type("Query", "kotlin.Any")
151156
.kotlin_value_type("Reply", "kotlin.Any")
152-
153157
// ── impl Into<T> source arms.
154158
.into_sources(
155159
"ZKeyExpr<'static>",
@@ -165,11 +169,13 @@ fn main() {
165169
let rust_path = registry
166170
.write_rust(&jni, "zenoh_flat_jni.rs")
167171
.expect("write rust failed");
168-
println!("cargo:warning=Generated bindings at: {}", rust_path.display());
172+
println!(
173+
"cargo:warning=Generated bindings at: {}",
174+
rust_path.display()
175+
);
169176

170177
// ── Write Kotlin output ───────────────────────────────────────────
171-
let kotlin_root =
172-
std::path::Path::new("../zenoh-jni-runtime/src/commonMain/kotlin");
178+
let kotlin_root = std::path::Path::new("../zenoh-jni-runtime/src/commonMain/kotlin");
173179
for path in jni
174180
.write_kotlin(&registry, kotlin_root)
175181
.expect("write kotlin failed")

‎zenoh-jni/src/config.rs‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ use jni::{
2222
use zenoh::Config;
2323

2424
use crate::errors::ZResult;
25+
use crate::session::OwnedObject;
2526
use crate::throw_exception;
2627
use prebindgen_ext::jni::decode_string;
27-
use crate::session::OwnedObject;
2828

2929
/// Loads the default configuration, returning a raw pointer to it.
3030
///
@@ -55,8 +55,7 @@ pub extern "C" fn Java_io_zenoh_jni_JNIConfig_00024Companion_loadConfigFileViaJN
5555
config_path: JString,
5656
) -> *const Config {
5757
|| -> ZResult<*const Config> {
58-
let config_file_path = decode_string(&mut env, &config_path)
59-
.map_err(|err| zerror!(err))?;
58+
let config_file_path = decode_string(&mut env, &config_path).map_err(|err| zerror!(err))?;
6059
let config = Config::from_file(config_file_path).map_err(|err| zerror!(err))?;
6160
Ok(Box::into_raw(Box::new(config)) as *const Config)
6261
}()
@@ -80,8 +79,7 @@ pub extern "C" fn Java_io_zenoh_jni_JNIConfig_00024Companion_loadJsonConfigViaJN
8079
json_config: JString,
8180
) -> *const Config {
8281
|| -> ZResult<*const Config> {
83-
let json_config = decode_string(&mut env, &json_config)
84-
.map_err(|err| zerror!(err))?;
82+
let json_config = decode_string(&mut env, &json_config).map_err(|err| zerror!(err))?;
8583
let config = zenoh_flat::config::load_json_config(&json_config)?;
8684
Ok(Box::into_raw(Box::new(config)) as *const Config)
8785
}()
@@ -105,8 +103,7 @@ pub extern "C" fn Java_io_zenoh_jni_JNIConfig_00024Companion_loadYamlConfigViaJN
105103
yaml_config: JString,
106104
) -> *const Config {
107105
|| -> ZResult<*const Config> {
108-
let yaml_config = decode_string(&mut env, &yaml_config)
109-
.map_err(|err| zerror!(err))?;
106+
let yaml_config = decode_string(&mut env, &yaml_config).map_err(|err| zerror!(err))?;
110107
let config = zenoh_flat::config::load_yaml_config(&yaml_config)?;
111108
Ok(Box::into_raw(Box::new(config)) as *const Config)
112109
}()
@@ -128,8 +125,7 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNIConfig_00024Companion_getJsonViaJN
128125
) -> jstring {
129126
let arc_cfg = OwnedObject::from_raw(cfg_ptr);
130127
|| -> ZResult<jstring> {
131-
let key = decode_string(&mut env, &key)
132-
.map_err(|err| zerror!(err))?;
128+
let key = decode_string(&mut env, &key).map_err(|err| zerror!(err))?;
133129
let json = arc_cfg.get_json(&key).map_err(|err| zerror!(err))?;
134130
let java_json = env.new_string(json).map_err(|err| zerror!(err))?;
135131
Ok(java_json.as_raw())
@@ -152,10 +148,8 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNIConfig_00024Companion_insertJson5V
152148
value: JString,
153149
) {
154150
|| -> ZResult<()> {
155-
let key = decode_string(&mut env, &key)
156-
.map_err(|err| zerror!(err))?;
157-
let value = decode_string(&mut env, &value)
158-
.map_err(|err| zerror!(err))?;
151+
let key = decode_string(&mut env, &key).map_err(|err| zerror!(err))?;
152+
let value = decode_string(&mut env, &value).map_err(|err| zerror!(err))?;
159153
let mut config = core::ptr::read(cfg_ptr);
160154
let insert_result = config
161155
.insert_json5(&key, &value)

‎zenoh-jni/src/ext/advanced_publisher.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use zenoh::handlers::{Callback, DefaultHandler};
2323
use zenoh::Wait;
2424
use zenoh_ext::AdvancedPublisher;
2525

26-
use crate::utils::{get_callback_global_ref, get_java_vm, load_on_close};
2726
use crate::session::OwnedObject;
27+
use crate::utils::{get_callback_global_ref, get_java_vm, load_on_close};
2828

2929
use crate::throw_exception;
3030

‎zenoh-jni/src/ext/matching_listener.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ pub(crate) unsafe extern "C" fn Java_io_zenoh_jni_JNIMatchingListener_freePtrVia
3535
_: JClass,
3636
matching_listener_ptr: *const MatchingListener<()>,
3737
) {
38-
drop(Box::from_raw(matching_listener_ptr as *mut MatchingListener<()>));
38+
drop(Box::from_raw(
39+
matching_listener_ptr as *mut MatchingListener<()>,
40+
));
3941
}

‎zenoh-jni/src/ext/sample_miss_listener.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@ pub(crate) unsafe extern "C" fn Java_io_zenoh_jni_JNISampleMissListener_freePtrV
3535
_: JClass,
3636
sample_miss_listener_ptr: *const SampleMissListener<()>,
3737
) {
38-
drop(Box::from_raw(sample_miss_listener_ptr as *mut SampleMissListener<()>));
38+
drop(Box::from_raw(
39+
sample_miss_listener_ptr as *mut SampleMissListener<()>,
40+
));
3941
}

‎zenoh-jni/src/liveliness.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ use zenoh::{
2424
internal::runtime::ZRuntime, liveliness::LivelinessToken, pubsub::Subscriber, Session, Wait,
2525
};
2626

27+
use crate::session::OwnedObject;
2728
use crate::{
2829
errors::ZResult,
2930
key_expr::decode_jni_key_expr,
3031
sample_callback::{on_reply_error, on_reply_success},
3132
throw_exception,
3233
utils::{get_callback_global_ref, get_java_vm, load_on_close, wrap_with_on_close},
3334
};
34-
use crate::session::OwnedObject;
3535

3636
#[no_mangle]
3737
#[allow(non_snake_case)]

‎zenoh-jni/src/querier.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ use jni::{
2020
};
2121
use zenoh::{query::Querier, Wait};
2222

23+
use crate::session::OwnedObject;
2324
use crate::{
2425
errors::ZResult,
2526
key_expr::decode_jni_key_expr,
2627
sample_callback::{on_reply_error, on_reply_success},
2728
throw_exception,
2829
utils::{
29-
decode_byte_array, decode_jni_encoding, get_callback_global_ref, get_java_vm,
30-
load_on_close,
30+
decode_byte_array, decode_jni_encoding, get_callback_global_ref, get_java_vm, load_on_close,
3131
},
3232
};
33-
use crate::session::OwnedObject;
3433
use prebindgen_ext::jni::decode_string;
3534

3635
/// Perform a Zenoh GET through a querier.
@@ -95,8 +94,7 @@ pub unsafe extern "C" fn Java_io_zenoh_jni_JNIQuerier_getViaJNI(
9594
});
9695

9796
if !selector_params.is_null() {
98-
let params = decode_string(&mut env, &selector_params)
99-
.map_err(|err| zerror!(err))?;
97+
let params = decode_string(&mut env, &selector_params).map_err(|err| zerror!(err))?;
10098
get_builder = get_builder.parameters(params)
10199
};
102100

‎zenoh-jni/src/scouting.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ use jni::{
2222
use zenoh::{config::WhatAmIMatcher, Wait};
2323
use zenoh::{scouting::Scout, Config};
2424

25+
use crate::session::OwnedObject;
2526
use crate::utils::{get_callback_global_ref, get_java_vm, load_on_close};
2627
use crate::{errors::ZResult, throw_exception};
27-
use crate::session::OwnedObject;
2828

2929
/// Start a scout.
3030
///

‎zenoh-jni/src/session.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ use zenoh::{
2020
key_expr::{KeyExpr as ZKeyExpr, SetIntersectionLevel},
2121
pubsub::{Publisher, Subscriber},
2222
qos::{CongestionControl, Priority, Reliability},
23-
query::{ConsolidationMode, Querier, Query, Queryable, QueryTarget, Reply, ReplyKeyExpr},
23+
query::{ConsolidationMode, Querier, Query, QueryTarget, Queryable, Reply, ReplyKeyExpr},
2424
session::{Session, ZenohId},
2525
};
26-
use zenoh_flat::sample::Sample;
2726
#[cfg(feature = "zenoh-ext")]
2827
use zenoh_ext::{AdvancedPublisher, AdvancedSubscriber};
28+
use zenoh_flat::sample::Sample;
2929
#[cfg(feature = "zenoh-ext")]
3030
use zenoh_flat::structs::{CacheConfig, HistoryConfig, MissDetectionConfig, RecoveryConfig};
3131

0 commit comments

Comments
 (0)