Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd9ae5b4

Browse files
committed
Formating fixes after latest rust update
1 parent8952890 commitd9ae5b4

File tree

7 files changed

+74
-58
lines changed

7 files changed

+74
-58
lines changed

‎src/algorithm/mod.rs

Lines changed: 55 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -527,11 +527,12 @@ where
527527
macro_rules! all_reduce_func_def{
528528
($doc_str: expr, $fn_name: ident, $ffi_name: ident, $assoc_type:ident) =>{
529529
#[doc=$doc_str]
530-
pubfn $fn_name<T>(input:&Array<T>)
531-
->(
532-
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
533-
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType
534-
)
530+
pubfn $fn_name<T>(
531+
input:&Array<T>,
532+
) ->(
533+
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
534+
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
535+
)
535536
where
536537
T:HasAfEnum,
537538
<TasHasAfEnum>::$assoc_type:HasAfEnum,
@@ -541,7 +542,9 @@ macro_rules! all_reduce_func_def {
541542
letmut imag:f64 =0.0;
542543
unsafe{
543544
let err_val = $ffi_name(
544-
&mut realas*mut c_double,&mut imagas*mut c_double, input.get(),
545+
&mut realas*mut c_double,
546+
&mut imagas*mut c_double,
547+
input.get(),
545548
);
546549
HANDLE_ERROR(AfError::from(err_val));
547550
}
@@ -676,13 +679,15 @@ macro_rules! all_reduce_func_def2 {
676679
pubfn $fn_name<T>(input:&Array<T>) ->($out_type, $out_type)
677680
where
678681
T:HasAfEnum,
679-
$out_type:HasAfEnum +Fromf64
682+
$out_type:HasAfEnum +Fromf64,
680683
{
681684
letmut real:f64 =0.0;
682685
letmut imag:f64 =0.0;
683686
unsafe{
684687
let err_val = $ffi_name(
685-
&mut realas*mut c_double,&mut imagas*mut c_double, input.get(),
688+
&mut realas*mut c_double,
689+
&mut imagas*mut c_double,
690+
input.get(),
686691
);
687692
HANDLE_ERROR(AfError::from(err_val));
688693
}
@@ -869,13 +874,16 @@ macro_rules! dim_ireduce_func_def {
869874
T::$out_type:HasAfEnum,
870875
{
871876
unsafe{
872-
letmut temp: af_array = std::ptr::null_mut();
873-
letmut idx: af_array = std::ptr::null_mut();
877+
letmut temp: af_array = std::ptr::null_mut();
878+
letmut idx: af_array = std::ptr::null_mut();
874879
let err_val = $ffi_name(
875-
&mut tempas*mut af_array,&mut idxas*mut af_array, input.get(), dim,
880+
&mut tempas*mut af_array,
881+
&mut idxas*mut af_array,
882+
input.get(),
883+
dim,
876884
);
877885
HANDLE_ERROR(AfError::from(err_val));
878-
(temp.into(), idx.into())
886+
(temp.into(), idx.into())
879887
}
880888
}
881889
};
@@ -910,12 +918,13 @@ dim_ireduce_func_def!("
910918
macro_rules! all_ireduce_func_def{
911919
($doc_str: expr, $fn_name: ident, $ffi_name: ident, $assoc_type:ident) =>{
912920
#[doc=$doc_str]
913-
pubfn $fn_name<T>(input:&Array<T>)
914-
->(
915-
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
916-
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
917-
u32
918-
)
921+
pubfn $fn_name<T>(
922+
input:&Array<T>,
923+
) ->(
924+
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
925+
<<TasHasAfEnum>::$assoc_typeasHasAfEnum>::BaseType,
926+
u32,
927+
)
919928
where
920929
T:HasAfEnum,
921930
<TasHasAfEnum>::$assoc_type:HasAfEnum,
@@ -926,8 +935,10 @@ macro_rules! all_ireduce_func_def {
926935
letmut temp:u32 =0;
927936
unsafe{
928937
let err_val = $ffi_name(
929-
&mut realas*mut c_double,&mut imagas*mut c_double,
930-
&mut tempas*mut c_uint, input.get(),
938+
&mut realas*mut c_double,
939+
&mut imagas*mut c_double,
940+
&mut tempas*mut c_uint,
941+
input.get(),
931942
);
932943
HANDLE_ERROR(AfError::from(err_val));
933944
}
@@ -1277,23 +1288,28 @@ macro_rules! dim_reduce_by_key_func_def {
12771288
/// Tuple of Arrays, with output keys and values after reduction
12781289
///
12791290
#[doc=$ex_str]
1280-
pubfn $fn_name<KeyType,ValueType>(keys:&Array<KeyType>, vals:&Array<ValueType>,
1281-
dim:i32
1291+
pubfn $fn_name<KeyType,ValueType>(
1292+
keys:&Array<KeyType>,
1293+
vals:&Array<ValueType>,
1294+
dim:i32,
12821295
) ->(Array<KeyType>,Array<$out_type>)
12831296
where
12841297
KeyType:ReduceByKeyInput,
12851298
ValueType:HasAfEnum,
12861299
$out_type:HasAfEnum,
12871300
{
12881301
unsafe{
1289-
letmut out_keys: af_array = std::ptr::null_mut();
1290-
letmut out_vals: af_array = std::ptr::null_mut();
1302+
letmut out_keys: af_array = std::ptr::null_mut();
1303+
letmut out_vals: af_array = std::ptr::null_mut();
12911304
let err_val = $ffi_name(
1292-
&mut out_keysas*mut af_array,&mut out_valsas*mut af_array,
1293-
keys.get(), vals.get(), dim,
1305+
&mut out_keysas*mut af_array,
1306+
&mut out_valsas*mut af_array,
1307+
keys.get(),
1308+
vals.get(),
1309+
dim,
12941310
);
12951311
HANDLE_ERROR(AfError::from(err_val));
1296-
(out_keys.into(), out_vals.into())
1312+
(out_keys.into(), out_vals.into())
12971313
}
12981314
}
12991315
};
@@ -1408,24 +1424,30 @@ macro_rules! dim_reduce_by_key_nan_func_def {
14081424
/// Tuple of Arrays, with output keys and values after reduction
14091425
///
14101426
#[doc=$ex_str]
1411-
pubfn $fn_name<KeyType,ValueType>(keys:&Array<KeyType>, vals:&Array<ValueType>,
1412-
dim:i32, replace_value:f64
1427+
pubfn $fn_name<KeyType,ValueType>(
1428+
keys:&Array<KeyType>,
1429+
vals:&Array<ValueType>,
1430+
dim:i32,
1431+
replace_value:f64,
14131432
) ->(Array<KeyType>,Array<$out_type>)
14141433
where
14151434
KeyType:ReduceByKeyInput,
14161435
ValueType:HasAfEnum,
14171436
$out_type:HasAfEnum,
14181437
{
14191438
unsafe{
1420-
letmut out_keys: af_array = std::ptr::null_mut();
1421-
letmut out_vals: af_array = std::ptr::null_mut();
1439+
letmut out_keys: af_array = std::ptr::null_mut();
1440+
letmut out_vals: af_array = std::ptr::null_mut();
14221441
let err_val = $ffi_name(
14231442
&mut out_keysas*mut af_array,
14241443
&mut out_valsas*mut af_array,
1425-
keys.get(), vals.get(), dim, replace_value,
1444+
keys.get(),
1445+
vals.get(),
1446+
dim,
1447+
replace_value,
14261448
);
14271449
HANDLE_ERROR(AfError::from(err_val));
1428-
(out_keys.into(), out_vals.into())
1450+
(out_keys.into(), out_vals.into())
14291451
}
14301452
}
14311453
};

‎src/core/arith.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,7 @@ macro_rules! binary_func {
293293
{
294294
unsafe{
295295
letmut temp: af_array = std::ptr::null_mut();
296-
let err_val = $ffi_fn(
297-
&mut tempas*mut af_array, lhs.get(), rhs.get(), batch,
298-
);
296+
let err_val = $ffi_fn(&mut tempas*mut af_array, lhs.get(), rhs.get(), batch);
299297
HANDLE_ERROR(AfError::from(err_val));
300298
Into::<Array<A::Output>>::into(temp)
301299
}
@@ -404,9 +402,7 @@ macro_rules! overloaded_binary_func {
404402
{
405403
unsafe{
406404
letmut temp: af_array = std::ptr::null_mut();
407-
let err_val = $ffi_name(
408-
&mut tempas*mut af_array, lhs.get(), rhs.get(), batch,
409-
);
405+
let err_val = $ffi_name(&mut tempas*mut af_array, lhs.get(), rhs.get(), batch);
410406
HANDLE_ERROR(AfError::from(err_val));
411407
temp.into()
412408
}
@@ -508,9 +504,7 @@ macro_rules! overloaded_compare_func {
508504
{
509505
unsafe{
510506
letmut temp: af_array = std::ptr::null_mut();
511-
let err_val = $ffi_name(
512-
&mut tempas*mut af_array, lhs.get(), rhs.get(), batch,
513-
);
507+
let err_val = $ffi_name(&mut tempas*mut af_array, lhs.get(), rhs.get(), batch);
514508
HANDLE_ERROR(AfError::from(err_val));
515509
temp.into()
516510
}
@@ -545,11 +539,7 @@ macro_rules! overloaded_compare_func {
545539
/// - Only one element in `arg1` or `arg2` along a given dimension/axis
546540
///
547541
/// - The trait `Convertable` essentially translates to a scalar native type on rust or Array.
548-
pubfn $fn_name<T,U>(
549-
arg1:&T,
550-
arg2:&U,
551-
batch:bool,
552-
) ->Array<bool>
542+
pubfn $fn_name<T,U>(arg1:&T, arg2:&U, batch:bool) ->Array<bool>
553543
where
554544
T:Convertable,
555545
U:Convertable,

‎src/core/array.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ unsafe impl<T: HasAfEnum> Send for Array<T> {}
185185
unsafeimpl<T:HasAfEnum>SyncforArray<T>{}
186186

187187
macro_rules! is_func{
188-
($doc_str: expr, $fn_name: ident, $ffi_fn: ident) =>(
188+
($doc_str: expr, $fn_name: ident, $ffi_fn: ident) =>{
189189
#[doc=$doc_str]
190190
pubfn $fn_name(&self) ->bool{
191191
unsafe{
@@ -195,7 +195,7 @@ macro_rules! is_func {
195195
ret_val
196196
}
197197
}
198-
)
198+
};
199199
}
200200

201201
impl<T>Array<T>

‎src/image/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ macro_rules! filt_func_def {
963963
T:HasAfEnum +ImageFilterType,
964964
{
965965
unsafe{
966-
letmut temp: af_array = std::ptr::null_mut();
966+
letmut temp: af_array = std::ptr::null_mut();
967967
let err_val = $ffi_name(
968968
&mut tempas*mut af_array,
969969
input.get(),
@@ -1181,7 +1181,7 @@ macro_rules! grayrgb_func_def {
11811181
T:HasAfEnum +GrayRGBConvertible,
11821182
{
11831183
unsafe{
1184-
letmut temp: af_array = std::ptr::null_mut();
1184+
letmut temp: af_array = std::ptr::null_mut();
11851185
let err_val = $ffi_name(&mut tempas*mut af_array, input.get(), r, g, b);
11861186
HANDLE_ERROR(AfError::from(err_val));
11871187
temp.into()
@@ -1201,7 +1201,7 @@ macro_rules! hsvrgb_func_def {
12011201
T:HasAfEnum +RealFloating,
12021202
{
12031203
unsafe{
1204-
letmut temp: af_array = std::ptr::null_mut();
1204+
letmut temp: af_array = std::ptr::null_mut();
12051205
let err_val = $ffi_name(&mut tempas*mut af_array, input.get());
12061206
HANDLE_ERROR(AfError::from(err_val));
12071207
temp.into()

‎src/signal/mod.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ macro_rules! conv_func_def {
721721
F:HasAfEnum,
722722
{
723723
unsafe{
724-
letmut temp: af_array = std::ptr::null_mut();
724+
letmut temp: af_array = std::ptr::null_mut();
725725
let err_val = $ffi_name(
726726
&mut tempas*mut af_array,
727727
signal.get(),
@@ -796,9 +796,13 @@ macro_rules! fft_conv_func_def {
796796
F:HasAfEnum,
797797
{
798798
unsafe{
799-
letmut temp: af_array = std::ptr::null_mut();
799+
letmut temp: af_array = std::ptr::null_mut();
800800
let err_val = $ffi_name(
801-
&mut tempas*mut af_array, signal.get(), filter.get(), modeas c_uint);
801+
&mut tempas*mut af_array,
802+
signal.get(),
803+
filter.get(),
804+
modeas c_uint,
805+
);
802806
HANDLE_ERROR(AfError::from(err_val));
803807
temp.into()
804808
}

‎src/statistics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ macro_rules! stat_wtd_func_def {
142142
{
143143
unsafe{
144144
letmut temp: af_array = std::ptr::null_mut();
145-
let err_val = $ffi_fn(&mut tempas*mut af_array,input.get(), weights.get(), dim);
145+
let err_val = $ffi_fn(&mut tempas*mut af_array,input.get(), weights.get(), dim);
146146
HANDLE_ERROR(AfError::from(err_val));
147147
temp.into()
148148
}

‎src/vision/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ unsafe impl Send for Features {}
131131
unsafeimplSyncforFeatures{}
132132

133133
macro_rules! feat_func_def{
134-
($doc_str: expr, $fn_name: ident, $ffi_name: ident) =>(
134+
($doc_str: expr, $fn_name: ident, $ffi_name: ident) =>{
135135
#[doc=$doc_str]
136136
pubfn $fn_name(&self) ->Array<f32>{
137137
unsafe{
@@ -146,7 +146,7 @@ macro_rules! feat_func_def {
146146
retained
147147
}
148148
}
149-
)
149+
};
150150
}
151151

152152
implFeatures{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp