Skip to content

Commit 64d323d

Browse files
cschwancschwan
committed
Run cargo fmt 
1 parent 9274d84 commit 64d323d

29 files changed

Lines changed: 186 additions & 120 deletions

‎pineappl/src/boc.rs‎

Lines changed: 52 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use super::convert;
88
use super::error::{Error, Result};
99
use float_cmp::approx_eq;
10-
use itertools::{izip, Itertools};
10+
use itertools::{Itertools, izip};
1111
use serde::{Deserialize, Serialize};
1212
use std::borrow::Cow;
1313
use std::cmp::Ordering;
@@ -527,7 +527,9 @@ impl FromStr for BinsWithFillLimits {
527527
.collect();
528528
let mut remaps = remaps?;
529529

530-
if let Some(first) = remaps.first() && first.len() != 1 {
530+
if let Some(first) = remaps.first()
531+
&& first.len() != 1
532+
{
531533
return Err(Error::General(
532534
"'|' syntax not meaningful for first dimension".to_owned(),
533535
));
@@ -1354,67 +1356,99 @@ mod tests {
13541356

13551357
assert_eq!(
13561358
Order::create_mask(&orders, 0, 0, false),
1357-
[false, false, false, false, false, false, false, false, false, false, false, false]
1359+
[
1360+
false, false, false, false, false, false, false, false, false, false, false, false
1361+
]
13581362
);
13591363
assert_eq!(
13601364
Order::create_mask(&orders, 0, 1, false),
1361-
[false, false, true, false, false, false, false, false, false, false, false, false]
1365+
[
1366+
false, false, true, false, false, false, false, false, false, false, false, false
1367+
]
13621368
);
13631369
assert_eq!(
13641370
Order::create_mask(&orders, 0, 2, false),
1365-
[false, false, true, false, false, false, true, false, false, false, false, false]
1371+
[
1372+
false, false, true, false, false, false, true, false, false, false, false, false
1373+
]
13661374
);
13671375
assert_eq!(
13681376
Order::create_mask(&orders, 0, 3, false),
1369-
[false, false, true, false, false, false, true, false, false, false, false, true]
1377+
[
1378+
false, false, true, false, false, false, true, false, false, false, false, true
1379+
]
13701380
);
13711381
assert_eq!(
13721382
Order::create_mask(&orders, 1, 0, false),
1373-
[true, false, false, false, false, false, false, false, false, false, false, false]
1383+
[
1384+
true, false, false, false, false, false, false, false, false, false, false, false
1385+
]
13741386
);
13751387
assert_eq!(
13761388
Order::create_mask(&orders, 1, 1, false),
1377-
[true, true, true, false, false, false, false, false, false, false, false, false]
1389+
[
1390+
true, true, true, false, false, false, false, false, false, false, false, false
1391+
]
13781392
);
13791393
assert_eq!(
13801394
Order::create_mask(&orders, 1, 2, false),
1381-
[true, true, true, false, false, false, true, false, false, false, false, false]
1395+
[
1396+
true, true, true, false, false, false, true, false, false, false, false, false
1397+
]
13821398
);
13831399
assert_eq!(
13841400
Order::create_mask(&orders, 1, 3, false),
1385-
[true, true, true, false, false, false, true, false, false, false, false, true]
1401+
[
1402+
true, true, true, false, false, false, true, false, false, false, false, true
1403+
]
13861404
);
13871405
assert_eq!(
13881406
Order::create_mask(&orders, 2, 0, false),
1389-
[true, false, false, true, false, false, false, false, false, false, false, false]
1407+
[
1408+
true, false, false, true, false, false, false, false, false, false, false, false
1409+
]
13901410
);
13911411
assert_eq!(
13921412
Order::create_mask(&orders, 2, 1, false),
1393-
[true, true, true, true, false, false, false, false, false, false, false, false]
1413+
[
1414+
true, true, true, true, false, false, false, false, false, false, false, false
1415+
]
13941416
);
13951417
assert_eq!(
13961418
Order::create_mask(&orders, 2, 2, false),
1397-
[true, true, true, true, true, true, true, false, false, false, false, false]
1419+
[
1420+
true, true, true, true, true, true, true, false, false, false, false, false
1421+
]
13981422
);
13991423
assert_eq!(
14001424
Order::create_mask(&orders, 2, 3, false),
1401-
[true, true, true, true, true, true, true, false, false, false, false, true]
1425+
[
1426+
true, true, true, true, true, true, true, false, false, false, false, true
1427+
]
14021428
);
14031429
assert_eq!(
14041430
Order::create_mask(&orders, 3, 0, false),
1405-
[true, false, false, true, false, false, false, true, false, false, false, false]
1431+
[
1432+
true, false, false, true, false, false, false, true, false, false, false, false
1433+
]
14061434
);
14071435
assert_eq!(
14081436
Order::create_mask(&orders, 3, 1, false),
1409-
[true, true, true, true, false, false, false, true, false, false, false, false]
1437+
[
1438+
true, true, true, true, false, false, false, true, false, false, false, false
1439+
]
14101440
);
14111441
assert_eq!(
14121442
Order::create_mask(&orders, 3, 2, false),
1413-
[true, true, true, true, true, true, true, true, false, false, false, false]
1443+
[
1444+
true, true, true, true, true, true, true, true, false, false, false, false
1445+
]
14141446
);
14151447
assert_eq!(
14161448
Order::create_mask(&orders, 3, 3, false),
1417-
[true, true, true, true, true, true, true, true, true, true, true, true]
1449+
[
1450+
true, true, true, true, true, true, true, true, true, true, true, true
1451+
]
14181452
);
14191453
}
14201454

‎pineappl/src/evolution.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ use super::packed_array::PackedArray;
88
use super::pids::PidBasis;
99
use super::subgrid::{self, ImportSubgridV1, Subgrid, SubgridEnum};
1010
use float_cmp::approx_eq;
11-
use itertools::izip;
1211
use itertools::Itertools;
12+
use itertools::izip;
1313
use ndarray::linalg;
1414
use ndarray::{
15-
s, Array1, Array2, Array3, ArrayD, ArrayView1, ArrayView4, ArrayViewD, ArrayViewMutD, Axis,
16-
Ix1, Ix2,
15+
Array1, Array2, Array3, ArrayD, ArrayView1, ArrayView4, ArrayViewD, ArrayViewMutD, Axis, Ix1,
16+
Ix2, s,
1717
};
1818
use rayon::iter::{IndexedParallelIterator, IntoParallelRefMutIterator, ParallelIterator};
1919
use std::iter;
@@ -370,9 +370,11 @@ pub(crate) fn evolve_slice(
370370
// TODO: implement matching of different scales for different EKOs
371371
let mut fac1_scales: Vec<_> = infos.iter().map(|info| info.fac1).collect();
372372
fac1_scales.sort_by(f64::total_cmp);
373-
assert!(fac1_scales
374-
.windows(2)
375-
.all(|scales| subgrid::node_value_eq(scales[0], scales[1])));
373+
assert!(
374+
fac1_scales
375+
.windows(2)
376+
.all(|scales| subgrid::node_value_eq(scales[0], scales[1]))
377+
);
376378
let fac1 = fac1_scales[0];
377379

378380
assert_eq!(operators.len(), infos.len());

‎pineappl/src/fk_table.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use super::error::{Error, Result};
66
use super::grid::{Grid, GridOptFlags};
77
use super::pids::{OptRules, PidBasis};
88
use super::subgrid::{self, EmptySubgridV1, Subgrid};
9-
use ndarray::{s, ArrayD};
9+
use ndarray::{ArrayD, s};
1010
use std::collections::BTreeMap;
1111
use std::fmt::{self, Display, Formatter};
1212
use std::iter;

‎pineappl/src/grid.rs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use float_cmp::approx_eq;
1818
use git_version::git_version;
1919
use itertools::Itertools;
2020
use lz4_flex::frame::{FrameDecoder, FrameEncoder};
21-
use ndarray::{s, Array2, Array3, ArrayView3, ArrayViewMut3, Axis, CowArray, Dimension, Ix4, Zip};
21+
use ndarray::{Array2, Array3, ArrayView3, ArrayViewMut3, Axis, CowArray, Dimension, Ix4, Zip, s};
2222
use serde::{Deserialize, Serialize};
2323
use std::collections::BTreeMap;
2424
use std::io::{BufRead, BufReader, BufWriter, Read, Write};
@@ -108,7 +108,10 @@ impl Grid {
108108
.find_map(|(pids, _)| (pids.len() != convolutions.len()).then_some(pids.len()));
109109

110110
if let Some(pids_len) = offending_entry {
111-
panic!("channel #{channel_idx} has wrong number of PIDs: expected {}, found {pids_len}", convolutions.len());
111+
panic!(
112+
"channel #{channel_idx} has wrong number of PIDs: expected {}, found {pids_len}",
113+
convolutions.len()
114+
);
112115
}
113116
}
114117

@@ -1502,7 +1505,9 @@ impl Grid {
15021505
new_interps.remove(kin_pos);
15031506

15041507
for kin in &mut new_kinematics {
1505-
if let Kinematics::X(i) = kin && *i > conv_idx {
1508+
if let Kinematics::X(i) = kin
1509+
&& *i > conv_idx
1510+
{
15061511
*i -= 1;
15071512
}
15081513
}
@@ -1544,7 +1549,10 @@ impl Grid {
15441549

15451550
if conv_to_fix.conv_type().is_ff() {
15461551
new_o.logxia = 0;
1547-
} else if let Some(other_conv_idx) = other_conv_idx_opt && conv_to_fix.conv_type().is_pdf() && self.convolutions[other_conv_idx].conv_type().is_ff() {
1552+
} else if let Some(other_conv_idx) = other_conv_idx_opt
1553+
&& conv_to_fix.conv_type().is_pdf()
1554+
&& self.convolutions[other_conv_idx].conv_type().is_ff()
1555+
{
15481556
new_o.logxif = 0;
15491557
}
15501558

‎pineappl/src/interpolation.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ pub fn interpolate(
361361
#[cfg(test)]
362362
mod tests {
363363
use super::*;
364-
use float_cmp::assert_approx_eq;
365364
use float_cmp::Ulps;
365+
use float_cmp::assert_approx_eq;
366366

367367
#[test]
368368
fn interpolate_two_points() {

‎pineappl/src/packed_array.rs‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ impl<T: Clone + Copy + Default + PartialEq> IndexMut<usize> for PackedArray<T> {
347347

348348
// If the new element is within `threshold_distance` of the *next* group, we merge
349349
// the next group into this group.
350-
if let Some(start_index_next) = self.start_indices.get(point) && raveled_index + threshold_distance >= *start_index_next {
350+
if let Some(start_index_next) = self.start_indices.get(point)
351+
&& raveled_index + threshold_distance >= *start_index_next
352+
{
351353
let distance_next = start_index_next - raveled_index;
352354

353355
// Increase the length of this group
@@ -370,7 +372,9 @@ impl<T: Clone + Copy + Default + PartialEq> IndexMut<usize> for PackedArray<T> {
370372

371373
// Case 2a: the new element can be merged into the next group. No `self.lengths.remove` and
372374
// `self.start_indices.remove` here, since we are not merging two groups.
373-
if let Some(start_index_next) = self.start_indices.get(point) && raveled_index + threshold_distance >= *start_index_next {
375+
if let Some(start_index_next) = self.start_indices.get(point)
376+
&& raveled_index + threshold_distance >= *start_index_next
377+
{
374378
let distance = start_index_next - raveled_index;
375379

376380
self.start_indices[point] = raveled_index;
@@ -459,7 +463,9 @@ impl<T: Clone + Copy + Default + PartialEq> IndexMut<&[usize]> for PackedArray<T
459463

460464
// If the new element is within `threshold_distance` of the *next* group, we merge
461465
// the next group into this group.
462-
if let Some(start_index_next) = self.start_indices.get(point) && raveled_index + threshold_distance >= *start_index_next {
466+
if let Some(start_index_next) = self.start_indices.get(point)
467+
&& raveled_index + threshold_distance >= *start_index_next
468+
{
463469
let distance_next = start_index_next - raveled_index;
464470

465471
// Increase the length of this group
@@ -482,7 +488,9 @@ impl<T: Clone + Copy + Default + PartialEq> IndexMut<&[usize]> for PackedArray<T
482488

483489
// Case 2a: the new element can be merged into the next group. No `self.lengths.remove` and
484490
// `self.start_indices.remove` here, since we are not merging two groups.
485-
if let Some(start_index_next) = self.start_indices.get(point) && raveled_index + threshold_distance >= *start_index_next {
491+
if let Some(start_index_next) = self.start_indices.get(point)
492+
&& raveled_index + threshold_distance >= *start_index_next
493+
{
486494
let distance = start_index_next - raveled_index;
487495

488496
self.start_indices[point] = raveled_index;

‎pineappl/src/pids.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,9 @@ pub fn pdg_mc_ids_to_evol(tuples: &[(i32, f64)]) -> Option<i32> {
469469
.filter(|&(_, factor)| factor != 0.0)
470470
.collect();
471471

472-
if let &[(pid, factor)] = non_zero.as_slice() && approx_eq!(f64, factor, 1.0, ulps = 4) {
472+
if let &[(pid, factor)] = non_zero.as_slice()
473+
&& approx_eq!(f64, factor, 1.0, ulps = 4)
474+
{
473475
return Some(pid);
474476
}
475477

‎pineappl/src/v0.rs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,16 +181,18 @@ pub fn read_uncompressed_v0(mut reader: impl BufRead) -> Result<Grid> {
181181
fac.dedup_by(subgrid::node_value_eq_ref_mut);
182182
vec![ren, fac]
183183
} else {
184-
vec![old_subgrid
185-
.mu2_grid()
186-
.iter()
187-
.map(|mu2v0| {
188-
// TODO: implement importing flexible-scale grids
189-
assert!(subgrid::node_value_eq(mu2v0.ren, mu2v0.fac));
184+
vec![
185+
old_subgrid
186+
.mu2_grid()
187+
.iter()
188+
.map(|mu2v0| {
189+
// TODO: implement importing flexible-scale grids
190+
assert!(subgrid::node_value_eq(mu2v0.ren, mu2v0.fac));
190191

191-
mu2v0.fac
192-
})
193-
.collect()]
192+
mu2v0.fac
193+
})
194+
.collect(),
195+
]
194196
};
195197

196198
let mut dim = if flexible_scale_grid {

‎pineappl_applgrid/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub mod ffi {
121121
_: bool,
122122
) -> UniquePtr<igrid>;
123123
fn make_empty_grid(_: &[f64], _: &str, _: i32, _: i32, _: &str, _: &str)
124-
-> UniquePtr<grid>;
124+
-> UniquePtr<grid>;
125125
fn make_lumi_pdf(_: &str, _: &[i32]) -> UniquePtr<lumi_pdf>;
126126

127127
fn grid_combine(_: &grid) -> Vec<i32>;

‎pineappl_capi/src/lib.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
//!
5656
//! [translation tables]: https://github.com/eqrion/cbindgen/blob/master/docs.md#std-types
5757
58-
use itertools::{izip, Itertools};
58+
use itertools::{Itertools, izip};
5959
use ndarray::{Array4, CowArray};
6060
use pineappl::boc::{Bin, BinsWithFillLimits, Channel, Kinematics, Order, ScaleFuncForm, Scales};
6161
use pineappl::convolutions::{Conv, ConvType, ConvolutionCache};
@@ -143,7 +143,9 @@ fn grid_interpolation_params(key_vals: Option<&KeyVal>) -> Vec<InterpMain> {
143143
q2_order = usize::try_from(*value).unwrap();
144144
}
145145

146-
if let Some(value) = keyval.bools.get("reweight") && !value {
146+
if let Some(value) = keyval.bools.get("reweight")
147+
&& !value
148+
{
147149
reweight = ReweightMeth::NoReweight;
148150
}
149151

@@ -1875,7 +1877,11 @@ pub unsafe extern "C" fn pineappl_grid_metadata(
18751877
let grid = unsafe { &*grid };
18761878
let key = unsafe { CStr::from_ptr(key) }.to_string_lossy();
18771879

1878-
grid.metadata().get(key.as_ref()).map_or(std::ptr::null_mut(), |value| CString::new(value.as_str()).unwrap().into_raw())
1880+
grid.metadata()
1881+
.get(key.as_ref())
1882+
.map_or(std::ptr::null_mut(), |value| {
1883+
CString::new(value.as_str()).unwrap().into_raw()
1884+
})
18791885
}
18801886

18811887
/// Sets an internal key-value pair for the grid.

0 commit comments

Comments
 (0)