Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion native/chromium/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ fn generator(cef_path: std::path::Display) -> bindgen::Builder {
config.insert(bindgen::CodegenConfig::TYPES);
let callbacks = ToJavaCallbacks();
bindgen::builder()
.clang_arg(format!("-I{}", cef_path))
.clang_arg(format!("-I{cef_path}"))
.clang_arg(format!(
"-I{}",
"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A\\Include"
Expand Down
4 changes: 2 additions & 2 deletions native/chromium_jni_macro/src/jni_allocate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fn build_initialization(
}

let field_ident = field.ident.as_ref().unwrap();
let func_ident = syn::Ident::new(&format!("jni_{}", field_ident), Span::call_site());
let func_ident = syn::Ident::new(&format!("jni_{field_ident}"), Span::call_site());
let signature = jni_signature(field);

quote! { #field_ident: match env.get_method_id(class, stringify!(#field_ident), #signature) {
Expand Down Expand Up @@ -143,7 +143,7 @@ fn build_jni_callback(
Some(_) => quote! { return chromium_jni_utils::FromJavaValue::from_java_value(env, result); }
};

let func_ident = syn::Ident::new(&format!("jni_{}", field_ident), Span::call_site());
let func_ident = syn::Ident::new(&format!("jni_{field_ident}"), Span::call_site());

let signature = jni_signature(field);
quote! {
Expand Down
2 changes: 1 addition & 1 deletion native/chromium_jni_macro/src/jni_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,5 @@ pub fn create_jni_fn_name(namespace: &str, name: &str, suffix: &str) -> String {
let namespace = namespace.replace('_', "_1").replace('.', "_");
let name = name.replace('_', "_1");
let suffix = suffix.replace('_', "_1");
format!("Java_{}_{}{}", namespace, name, suffix)
format!("Java_{namespace}_{name}{suffix}")
}
8 changes: 4 additions & 4 deletions native/chromium_jni_macro/src/jni_wrap_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ fn setup_argument(
FnArg::Typed(pattern) => &pattern.ty,
FnArg::Receiver(_) => todo!(),
};
let arg = Ident::new(&format!("arg{}", index), Span::call_site());
let param = Ident::new(&format!("param{}", index), Span::call_site());
let arg = Ident::new(&format!("arg{index}"), Span::call_site());
let param = Ident::new(&format!("param{index}"), Span::call_site());
let (arg_type, prepare, cleanup) = handle_arg(&arg, &param, ty);

(
Expand Down Expand Up @@ -146,7 +146,7 @@ fn handle_return(retn: &Option<String>) -> (proc_macro2::TokenStream, proc_macro
quote! { return result as jni::sys::jlong },
)
} else {
panic!("Invalid return type {:?}", retn);
panic!("Invalid return type {retn:?}");
}
}
},
Expand Down Expand Up @@ -211,7 +211,7 @@ fn handle_arg(
{
(quote! { #ty }, quote! { #arg }, quote! {})
} else {
panic!("Invalid argument type {:?}", tystr);
panic!("Invalid argument type {tystr:?}");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion native/chromium_jni_macro/src/utils/jni_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn jni_type_signature(ty: &Type) -> char {
match ty {
Type::Ptr(_) => 'J',
Type::Path(_p) => 'I',
_ => panic!("Unhandled type {:?}", ty),
_ => panic!("Unhandled type {ty:?}"),
}
}

Expand Down
3 changes: 1 addition & 2 deletions native/chromium_subp/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ fn link() {

if !cef_path.exists() {
panic!(
"cargo:warning=Extract and rename cef binary (minimal) distro to {:?}",
cef_path
"cargo:warning=Extract and rename cef binary (minimal) distro to {cef_path:?}"
);
}

Expand Down
14 changes: 8 additions & 6 deletions native/chromium_subp/src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ fn register_function(
handler: &mut V8Handler,
) {
// Add the "myfunc" function to the "window" object.
let handler_name = chromium::utils::cef_string(&format!("{}", id));
let handler_name = chromium::utils::cef_string(&format!("{id}"));
let func =
unsafe { chromium::cef::cef_v8value_create_function(&handler_name, handler.as_ptr()) };
let s = unsafe {
Expand Down Expand Up @@ -255,19 +255,19 @@ unsafe fn convert_type(
(ret_str, socket::ReturnType::Null)
} else if (*ret).is_bool.unwrap()(ret) == 1 {
let ret_cef = (*ret).get_bool_value.unwrap()(ret);
let ret_str = CString::new(format!("{}", ret_cef)).unwrap();
let ret_str = CString::new(format!("{ret_cef}")).unwrap();
(ret_str, socket::ReturnType::Bool)
} else if (*ret).is_int.unwrap()(ret) == 1 {
let ret_cef = (*ret).get_int_value.unwrap()(ret);
let ret_str = CString::new(format!("{}", ret_cef)).unwrap();
let ret_str = CString::new(format!("{ret_cef}")).unwrap();
(ret_str, socket::ReturnType::Double)
} else if (*ret).is_uint.unwrap()(ret) == 1 {
let ret_cef = (*ret).get_uint_value.unwrap()(ret);
let ret_str = CString::new(format!("{}", ret_cef)).unwrap();
let ret_str = CString::new(format!("{ret_cef}")).unwrap();
(ret_str, socket::ReturnType::Double)
} else if (*ret).is_double.unwrap()(ret) == 1 {
let ret_cef = (*ret).get_double_value.unwrap()(ret);
let ret_str = CString::new(format!("{}", ret_cef)).unwrap();
let ret_str = CString::new(format!("{ret_cef}")).unwrap();
(ret_str, socket::ReturnType::Double)
} else if (*ret).is_string.unwrap()(ret) == 1 {
let ret_str_cef = (*ret).get_string_value.unwrap()(ret);
Expand All @@ -290,7 +290,9 @@ unsafe fn convert_type(
for i in 0..length {
let vali = (*array_val).get_value_byindex.unwrap()(array_val, i);
let (valcstr, valtyp) = convert_type(vali, _eval_id, context);
let valstr = format!("'{},{}'", valtyp as u32, valcstr.into_string().unwrap());
let typ = valtyp as u32;
let valstr = valcstr.into_string().unwrap();
let valstr = format!("'{typ},{valstr}'");
if i > 0 {
arraystr.push(';');
}
Expand Down
3 changes: 1 addition & 2 deletions native/chromium_swt/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ fn link() {
let cef_path = get_cef_path();
if !cef_path.exists() {
panic!(
"cargo:warning=Extract and rename cef binary (minimal) distro to {:?}",
cef_path
"cargo:warning=Extract and rename cef binary (minimal) distro to {cef_path:?}"
);
}

Expand Down
4 changes: 2 additions & 2 deletions native/chromium_swt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ pub fn cefswt_init(
fn set_env_var(cef_path: &str, var: &str, sep: &str) {
match std::env::var(var) {
Ok(paths) => {
let paths = format!("{}{}{}", cef_path, sep, paths);
let paths = format!("{cef_path}{sep}{paths}");
std::env::set_var(var, paths);
}
Err(e) => {
println!("Couldn't read {} ({})", var, e);
println!("Couldn't read {var} ({e})");
std::env::set_var(var, cef_path);
}
};
Expand Down