Skip to content

Commit 74360e5

Browse files
committed
style: apply cargo fmt to all files.
Formatting changes slightly in Rust 2024.
1 parent 28cae19 commit 74360e5

90 files changed

Lines changed: 368 additions & 344 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

capi/src/compiler.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use std::ffi::{c_char, CStr};
1+
use std::ffi::{CStr, c_char};
22
use std::mem;
33
use std::mem::ManuallyDrop;
44

5-
use yara_x::errors::{CompileError, SerializationError, VariableError};
65
use yara_x::SourceCode;
6+
use yara_x::errors::{CompileError, SerializationError, VariableError};
77

88
use crate::{_yrx_set_last_error, YRX_BUFFER, YRX_RESULT, YRX_RULES};
99

capi/src/lib.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ includes:
9595
#![allow(clippy::not_unsafe_ptr_arg_deref)]
9696

9797
use std::cell::RefCell;
98-
use std::ffi::{c_char, CStr, CString};
98+
use std::ffi::{CStr, CString, c_char};
9999
use std::ptr::slice_from_raw_parts_mut;
100100

101101
use yara_x::errors::CompileError;
@@ -171,11 +171,7 @@ pub enum YRX_RESULT {
171171
#[unsafe(no_mangle)]
172172
pub unsafe extern "C" fn yrx_last_error() -> *const c_char {
173173
LAST_ERROR.with_borrow(|err| {
174-
if let Some(err) = err {
175-
err.as_ptr()
176-
} else {
177-
std::ptr::null()
178-
}
174+
if let Some(err) = err { err.as_ptr() } else { std::ptr::null() }
179175
})
180176
}
181177

capi/src/rule.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::ffi::{c_char, c_void, CString};
1+
use std::ffi::{CString, c_char, c_void};
22
use yara_x::MetaValue;
33

44
use crate::{

capi/src/rules.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::ffi::{c_char, c_int, c_void, CString};
1+
use std::ffi::{CString, c_char, c_int, c_void};
22
use std::mem::ManuallyDrop;
33
use std::slice;
44

capi/src/scanner.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
use std::collections::HashMap;
22
use std::ffi::CString;
3-
use std::ffi::{c_char, c_void, CStr};
3+
use std::ffi::{CStr, c_char, c_void};
44
use std::mem;
55
use std::time::Duration;
66

77
#[cfg(feature = "rules-profiling")]
88
use yara_x::ProfilingData;
99

10-
use yara_x::errors::ScanError;
1110
use yara_x::ScanOptions;
11+
use yara_x::errors::ScanError;
1212

1313
use crate::{
14-
_yrx_set_last_error, YRX_RESULT, YRX_RULE, YRX_RULES, YRX_RULE_CALLBACK,
14+
_yrx_set_last_error, YRX_RESULT, YRX_RULE, YRX_RULE_CALLBACK, YRX_RULES,
1515
};
1616

1717
enum InnerScanner<'r> {

capi/src/tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use crate::compiler::{
77
yrx_compiler_new_namespace,
88
};
99
use crate::{
10+
YRX_BUFFER, YRX_METADATA, YRX_PATTERN, YRX_RESULT, YRX_RULE,
1011
yrx_buffer_destroy, yrx_last_error, yrx_rule_identifier,
1112
yrx_rule_iter_metadata, yrx_rule_iter_patterns, yrx_rule_iter_tags,
1213
yrx_rule_namespace, yrx_rules_deserialize, yrx_rules_destroy,
@@ -16,13 +17,12 @@ use crate::{
1617
yrx_scanner_scan, yrx_scanner_scan_block, yrx_scanner_set_global_bool,
1718
yrx_scanner_set_global_float, yrx_scanner_set_global_int,
1819
yrx_scanner_set_global_json, yrx_scanner_set_global_str,
19-
yrx_scanner_set_module_data, yrx_scanner_set_timeout, YRX_BUFFER,
20-
YRX_METADATA, YRX_PATTERN, YRX_RESULT, YRX_RULE,
20+
yrx_scanner_set_module_data, yrx_scanner_set_timeout,
2121
};
2222

23-
use std::ffi::{c_char, c_void, CStr};
23+
use std::ffi::{CStr, c_char, c_void};
2424

25-
use assert_call::{call, CallRecorder};
25+
use assert_call::{CallRecorder, call};
2626

2727
extern "C" fn on_rule_iter(_rule: *const YRX_RULE, user_data: *mut c_void) {
2828
let ptr = user_data as *mut i32;

cli/src/commands/check.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ use std::sync::atomic::{AtomicUsize, Ordering};
33
use std::{fs, io, process};
44

55
use anyhow::Context;
6-
use clap::{arg, value_parser, ArgAction, ArgMatches, Command};
6+
use clap::{ArgAction, ArgMatches, Command, arg, value_parser};
77
use crossterm::tty::IsTty;
88
use superconsole::{Component, Line, Lines, Span};
99
use yansi::Color::{Green, Red, Yellow};
1010
use yansi::Paint;
11-
use yara_x::{linters, SourceCode};
11+
use yara_x::{SourceCode, linters};
1212
use yara_x_parser::ast::MetaValue;
1313

1414
use crate::config::{Config, MetaValueType};

cli/src/commands/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::fs::File;
22
use std::path::PathBuf;
33

44
use anyhow::Context;
5-
use clap::{arg, value_parser, Arg, ArgAction, ArgMatches, Command};
5+
use clap::{Arg, ArgAction, ArgMatches, Command, arg, value_parser};
66

77
use crate::commands::{
88
compilation_args, compile_rules, path_with_namespace_parser,

cli/src/commands/completion.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::commands::cli;
22
use crate::help;
3-
use clap::{arg, value_parser, ArgAction, ArgMatches, Command};
4-
use clap_complete::{generate, Shell};
3+
use clap::{ArgAction, ArgMatches, Command, arg, value_parser};
4+
use clap_complete::{Shell, generate};
55
use std::io;
66

77
pub fn completion() -> Command {

cli/src/commands/debug.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ use std::io::stdout;
44
use std::path::PathBuf;
55

66
use anyhow::Context;
7-
use clap::{arg, value_parser, ArgAction, ArgMatches, Command};
7+
use clap::{ArgAction, ArgMatches, Command, arg, value_parser};
88

99
use yara_x::SourceCode;
10+
use yara_x_parser::Parser;
1011
use yara_x_parser::ast::AST;
1112
use yara_x_parser::cst::CST;
12-
use yara_x_parser::Parser;
1313

1414
use crate::commands::{
1515
create_compiler, external_var_parser, get_external_vars,

0 commit comments

Comments
 (0)