Skip to content

Commit 081197a

Browse files
committed
Applies Rust format to data_renderer
1 parent ba766ff commit 081197a

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

rust/examples/data_renderer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ crate-type = ["cdylib"]
99
[dependencies]
1010
uuid = "1.18.1"
1111
binaryninjacore-sys = { path = "../../binaryninjacore-sys", default-features = false }
12-
binaryninja = { path = "../../" }
12+
binaryninja = { path = "../.." }
1313
log = "0.4.27"

rust/examples/data_renderer/build.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
2-
let link_path =
3-
std::env::var_os("DEP_BINARYNINJACORE_PATH").expect("DEP_BINARYNINJACORE_PATH not specified");
2+
let link_path = std::env::var_os("DEP_BINARYNINJACORE_PATH")
3+
.expect("DEP_BINARYNINJACORE_PATH not specified");
44

55
println!("cargo::rustc-link-lib=dylib=binaryninjacore");
66
println!("cargo::rustc-link-search={}", link_path.to_str().unwrap());
@@ -17,6 +17,9 @@ fn main() {
1717
{
1818
let crate_name = std::env::var("CARGO_PKG_NAME").expect("CARGO_PKG_NAME not set");
1919
let lib_name = crate_name.replace('-', "_");
20-
println!("cargo::rustc-link-arg=-Wl,-install_name,@rpath/lib{}.dylib", lib_name);
20+
println!(
21+
"cargo::rustc-link-arg=-Wl,-install_name,@rpath/lib{}.dylib",
22+
lib_name
23+
);
2124
}
2225
}

rust/examples/data_renderer/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use binaryninja::binary_view::{BinaryView, BinaryViewBase};
22
use binaryninja::data_renderer::{
3-
CustomDataRenderer, TypeContext, register_specific_data_renderer,
3+
register_specific_data_renderer, CustomDataRenderer, TypeContext,
44
};
55
use binaryninja::disassembly::{
66
DisassemblyTextLine, InstructionTextToken, InstructionTextTokenKind,

rust/src/data_renderer.rs

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::types::Type;
1212
// don't have a *from_raw function, it don't need to worry about drop it.
1313
#[repr(transparent)]
1414
pub struct TypeContext {
15-
handle: BNTypeContext
15+
handle: BNTypeContext,
1616
}
1717

1818
impl TypeContext {
@@ -92,7 +92,8 @@ trait CustomDataRendererFFI: CustomDataRenderer {
9292
// SAFETY BNTypeContext and TypeContext are transparent
9393
let types = core::slice::from_raw_parts(type_ctx as *mut TypeContext, ctx_count);
9494
let prefix = core::slice::from_raw_parts(prefix, prefix_count)
95-
.iter().map(InstructionTextToken::from_raw)
95+
.iter()
96+
.map(InstructionTextToken::from_raw)
9697
.collect::<Vec<_>>();
9798
let result = (*ctxt).lines_for_data(
9899
&BinaryView::from_raw(view),
@@ -139,7 +140,9 @@ impl CoreDataRenderer {
139140
}
140141
}
141142

142-
fn create_custom_data_renderer<T: CustomDataRenderer>(renderer: T) -> (&'static mut T, CoreDataRenderer) {
143+
fn create_custom_data_renderer<T: CustomDataRenderer>(
144+
renderer: T,
145+
) -> (&'static mut T, CoreDataRenderer) {
143146
let renderer = Box::leak(Box::new(renderer));
144147
let mut callbacks = BNCustomDataRenderer {
145148
context: renderer as *mut _ as *mut c_void,
@@ -153,15 +156,19 @@ fn create_custom_data_renderer<T: CustomDataRenderer>(renderer: T) -> (&'static
153156
(renderer, core)
154157
}
155158

156-
pub fn register_generic_data_renderer<T: CustomDataRenderer>(custom: T) -> (&'static mut T, CoreDataRenderer) {
159+
pub fn register_generic_data_renderer<T: CustomDataRenderer>(
160+
custom: T,
161+
) -> (&'static mut T, CoreDataRenderer) {
157162
let (renderer, core) = create_custom_data_renderer(custom);
158163
// debug!("register_generic_data_renderer: core={:?}", core.handle);
159164
let container = DataRendererContainer::get();
160165
unsafe { BNRegisterGenericDataRenderer(container.handle, core.handle.as_ptr()) }
161166
(renderer, core)
162167
}
163168

164-
pub fn register_specific_data_renderer<C: CustomDataRenderer>(custom: C) -> (&'static mut C, CoreDataRenderer) {
169+
pub fn register_specific_data_renderer<C: CustomDataRenderer>(
170+
custom: C,
171+
) -> (&'static mut C, CoreDataRenderer) {
165172
let (renderer, core) = create_custom_data_renderer(custom);
166173
// debug!("register_specific_data_renderer: core={:?}", core.handle);
167174
let container = DataRendererContainer::get();
@@ -171,13 +178,13 @@ pub fn register_specific_data_renderer<C: CustomDataRenderer>(custom: C) -> (&'s
171178

172179
#[derive(Clone, Copy)]
173180
struct DataRendererContainer {
174-
pub(crate) handle: *mut BNDataRendererContainer
181+
pub(crate) handle: *mut BNDataRendererContainer,
175182
}
176183

177184
impl DataRendererContainer {
178185
pub fn get() -> Self {
179186
Self {
180-
handle: unsafe { BNGetDataRendererContainer() }
187+
handle: unsafe { BNGetDataRendererContainer() },
181188
}
182189
}
183-
}
190+
}

0 commit comments

Comments
 (0)