Skip to content

Commit e5441f9

Browse files
ShaharNavehShaharNaveh
committed
cargo fmt
1 parent 4a9c1bb commit e5441f9

Some content is hidden

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

59 files changed

+254
-466
lines changed

‎stdlib/src/array.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -656,15 +656,11 @@ mod array {
656656
vm: &VirtualMachine,
657657
) -> PyResult {
658658
let spec = spec.as_str().chars().exactly_one().map_err(|_| {
659-
vm.new_type_error(
660-
"array() argument 1 must be a unicode character, not str",
661-
)
659+
vm.new_type_error("array() argument 1 must be a unicode character, not str")
662660
})?;
663661

664662
if cls.is(PyArray::class(&vm.ctx)) && !kwargs.is_empty() {
665-
return Err(
666-
vm.new_type_error("array.array() takes no keyword arguments")
667-
);
663+
return Err(vm.new_type_error("array.array() takes no keyword arguments"));
668664
}
669665

670666
let mut array =
@@ -856,9 +852,7 @@ mod array {
856852

857853
fn _from_bytes(&self, b: &[u8], itemsize: usize, vm: &VirtualMachine) -> PyResult<()> {
858854
if b.len() % itemsize != 0 {
859-
return Err(
860-
vm.new_value_error("bytes length not a multiple of item size")
861-
);
855+
return Err(vm.new_value_error("bytes length not a multiple of item size"));
862856
}
863857
if b.len() / itemsize > 0 {
864858
self.try_resizable(vm)?.frombytes(b);

‎stdlib/src/bisect.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ mod _bisect {
4646
// Default is always a Some so we can safely unwrap.
4747
let lo = handle_default(lo, vm)?
4848
.map(|value| {
49-
usize::try_from(value)
50-
.map_err(|_| vm.new_value_error("lo must be non-negative"))
49+
usize::try_from(value).map_err(|_| vm.new_value_error("lo must be non-negative"))
5150
})
5251
.unwrap_or(Ok(0))?;
5352
let hi = handle_default(hi, vm)?

‎stdlib/src/bz2.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,7 @@ mod _bz2 {
140140
let level = match compresslevel {
141141
valid_level @ 1..=9 => bzip2::Compression::new(valid_level as u32),
142142
_ => {
143-
return Err(
144-
vm.new_value_error("compresslevel must be between 1 and 9")
145-
);
143+
return Err(vm.new_value_error("compresslevel must be between 1 and 9"));
146144
}
147145
};
148146

‎stdlib/src/csv.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,7 @@ mod _csv {
438438
fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
439439
let num = obj.try_int(vm)?.try_to_primitive::<isize>(vm)?;
440440
num.try_into().map_err(|_| {
441-
vm.new_value_error(
442-
"can not convert to QuoteStyle enum from input argument",
443-
)
441+
vm.new_value_error("can not convert to QuoteStyle enum from input argument")
444442
})
445443
}
446444
}

‎stdlib/src/dis.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ mod decl {
1717
#[cfg(not(feature = "compiler"))]
1818
{
1919
let _ = co_str;
20-
return Err(vm.new_runtime_error(
21-
"dis.dis() with str argument requires `compiler` feature",
22-
));
20+
return Err(
21+
vm.new_runtime_error("dis.dis() with str argument requires `compiler` feature")
22+
);
2323
}
2424
#[cfg(feature = "compiler")]
2525
{

‎stdlib/src/lzma.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ mod _lzma {
150150

151151
fn py_new(cls: PyTypeRef, args: Self::Args, vm: &VirtualMachine) -> PyResult {
152152
if args.format == FORMAT_RAW && args.memlimit.is_some() {
153-
return Err(
154-
vm.new_value_error("Cannot specify memory limit with FORMAT_RAW")
155-
);
153+
return Err(vm.new_value_error("Cannot specify memory limit with FORMAT_RAW"));
156154
}
157155
let memlimit = args.memlimit.unwrap_or(u64::MAX);
158156
let filters = args.filters.unwrap_or(0);
@@ -316,8 +314,8 @@ mod _lzma {
316314
filters: Option<Vec<PyObjectRef>>,
317315
vm: &VirtualMachine,
318316
) -> PyResult<Stream> {
319-
let real_check = int_to_check(check)
320-
.ok_or_else(|| vm.new_type_error("Invalid check value"))?;
317+
let real_check =
318+
int_to_check(check).ok_or_else(|| vm.new_type_error("Invalid check value"))?;
321319
if let Some(filters) = filters {
322320
let filters = parse_filter_chain_spec(filters, vm)?;
323321
Ok(Stream::new_stream_encoder(&filters, real_check)

‎stdlib/src/math.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -378,9 +378,7 @@ mod math {
378378
let mut diffs = vec![];
379379

380380
if p.len() != q.len() {
381-
return Err(vm.new_value_error(
382-
"both points must have the same number of dimensions",
383-
));
381+
return Err(vm.new_value_error("both points must have the same number of dimensions"));
384382
}
385383

386384
for i in 0..p.len() {
@@ -645,9 +643,7 @@ mod math {
645643
// as a result of a nan or inf in the
646644
// summands
647645
if xsave.is_finite() {
648-
return Err(
649-
vm.new_overflow_error("intermediate overflow in fsum")
650-
);
646+
return Err(vm.new_overflow_error("intermediate overflow in fsum"));
651647
}
652648
if xsave.is_infinite() {
653649
inf_sum += xsave;
@@ -712,9 +708,7 @@ mod math {
712708
let value = x.as_bigint();
713709
let one = BigInt::one();
714710
if value.is_negative() {
715-
return Err(
716-
vm.new_value_error("factorial() not defined for negative values")
717-
);
711+
return Err(vm.new_value_error("factorial() not defined for negative values"));
718712
} else if *value <= one {
719713
return Ok(one);
720714
}
@@ -832,9 +826,7 @@ mod math {
832826
match steps {
833827
Some(steps) => {
834828
if steps < 0 {
835-
return Err(
836-
vm.new_value_error("steps must be a non-negative integer")
837-
);
829+
return Err(vm.new_value_error("steps must be a non-negative integer"));
838830
}
839831
Ok(float_ops::nextafter_with_steps(
840832
*arg.x,

‎stdlib/src/mmap.rs

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -312,24 +312,18 @@ mod mmap {
312312
) -> PyResult {
313313
let map_size = length;
314314
if map_size < 0 {
315-
return Err(
316-
vm.new_overflow_error("memory mapped length must be positive")
317-
);
315+
return Err(vm.new_overflow_error("memory mapped length must be positive"));
318316
}
319317
let mut map_size = map_size as usize;
320318

321319
if offset < 0 {
322-
return Err(
323-
vm.new_overflow_error("memory mapped offset must be positive")
324-
);
320+
return Err(vm.new_overflow_error("memory mapped offset must be positive"));
325321
}
326322

327323
if (access != AccessMode::Default)
328324
&& ((flags != MAP_SHARED) || (prot != (PROT_WRITE | PROT_READ)))
329325
{
330-
return Err(vm.new_value_error(
331-
"mmap can't specify both access and flags, prot.",
332-
));
326+
return Err(vm.new_value_error("mmap can't specify both access and flags, prot."));
333327
}
334328

335329
// TODO: memmap2 doesn't support mapping with pro and flags right now
@@ -360,18 +354,14 @@ mod mmap {
360354
}
361355

362356
if offset > file_len {
363-
return Err(
364-
vm.new_value_error("mmap offset is greater than file size")
365-
);
357+
return Err(vm.new_value_error("mmap offset is greater than file size"));
366358
}
367359

368360
map_size = (file_len - offset)
369361
.try_into()
370362
.map_err(|_| vm.new_value_error("mmap length is too large"))?;
371363
} else if offset > file_len || file_len - offset < map_size as libc::off_t {
372-
return Err(
373-
vm.new_value_error("mmap length is greater than file size")
374-
);
364+
return Err(vm.new_value_error("mmap length is greater than file size"));
375365
}
376366
}
377367

@@ -526,9 +516,7 @@ mod mmap {
526516
f: impl FnOnce(&mut MmapMut) -> R,
527517
) -> PyResult<R> {
528518
if matches!(self.access, AccessMode::Read) {
529-
return Err(
530-
vm.new_type_error("mmap can't modify a readonly memory map.")
531-
);
519+
return Err(vm.new_type_error("mmap can't modify a readonly memory map."));
532520
}
533521

534522
match self.check_valid(vm)?.deref_mut().as_mut().unwrap() {
@@ -551,18 +539,14 @@ mod mmap {
551539
#[allow(dead_code)]
552540
fn check_resizeable(&self, vm: &VirtualMachine) -> PyResult<()> {
553541
if self.exports.load() > 0 {
554-
return Err(vm.new_buffer_error(
555-
"mmap can't resize with extant buffers exported.",
556-
));
542+
return Err(vm.new_buffer_error("mmap can't resize with extant buffers exported."));
557543
}
558544

559545
if self.access == AccessMode::Write || self.access == AccessMode::Default {
560546
return Ok(());
561547
}
562548

563-
Err(vm.new_type_error(
564-
"mmap can't resize a readonly or copy-on-write memory map.",
565-
))
549+
Err(vm.new_type_error("mmap can't resize a readonly or copy-on-write memory map."))
566550
}
567551

568552
#[pygetset]
@@ -707,9 +691,8 @@ mod mmap {
707691
}
708692

709693
let size = self.len();
710-
let (dest, src, cnt) = args(dest, src, cnt, size, vm).ok_or_else(|| {
711-
vm.new_value_error("source, destination, or count out of range")
712-
})?;
694+
let (dest, src, cnt) = args(dest, src, cnt, size, vm)
695+
.ok_or_else(|| vm.new_value_error("source, destination, or count out of range"))?;
713696

714697
let dest_end = dest + cnt;
715698
let src_end = src + cnt;

‎stdlib/src/pystruct.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ pub(crate) mod _struct {
3838
other.class().name()
3939
))),
4040
})
41-
.ok_or_else(|| {
42-
vm.new_unicode_decode_error("Struct format must be a ascii string")
43-
})?;
41+
.ok_or_else(|| vm.new_unicode_decode_error("Struct format must be a ascii string"))?;
4442
Ok(IntoStructFormatBytes(fmt))
4543
}
4644
}

‎stdlib/src/select.rs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,7 @@ mod decl {
353353
} else if let Some(float) = obj.payload::<PyFloat>() {
354354
let float = float.to_f64();
355355
if float.is_nan() {
356-
return Err(
357-
vm.new_value_error("Invalid value NaN (not a number)")
358-
);
356+
return Err(vm.new_value_error("Invalid value NaN (not a number)"));
359357
}
360358
if float.is_sign_negative() {
361359
None
@@ -367,9 +365,10 @@ mod decl {
367365
if int.as_bigint().is_negative() {
368366
None
369367
} else {
370-
let n = int.as_bigint().to_u64().ok_or_else(|| {
371-
vm.new_overflow_error("value out of range")
372-
})?;
368+
let n = int
369+
.as_bigint()
370+
.to_u64()
371+
.ok_or_else(|| vm.new_overflow_error("value out of range"))?;
373372
Some(if MILLIS {
374373
Duration::from_millis(n)
375374
} else {
@@ -438,9 +437,8 @@ mod decl {
438437
}
439438

440439
// Try converting to i16, should raise OverflowError if too large
441-
let mask = i16::try_from(val).map_err(|_| {
442-
vm.new_overflow_error("event mask value out of range")
443-
})?;
440+
let mask = i16::try_from(val)
441+
.map_err(|_| vm.new_overflow_error("event mask value out of range"))?;
444442

445443
Ok(EventMask(mask))
446444
}
@@ -625,9 +623,8 @@ mod decl {
625623
&self,
626624
vm: &VirtualMachine,
627625
) -> PyResult<impl Deref<Target = OwnedFd> + '_> {
628-
PyRwLockReadGuard::try_map(self.epoll_fd.read(), |x| x.as_ref()).map_err(|_| {
629-
vm.new_value_error("I/O operation on closed epoll object")
630-
})
626+
PyRwLockReadGuard::try_map(self.epoll_fd.read(), |x| x.as_ref())
627+
.map_err(|_| vm.new_value_error("I/O operation on closed epoll object"))
631628
}
632629

633630
#[pymethod]

‎stdlib/src/socket.rs

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -953,9 +953,7 @@ mod _socket {
953953
})?;
954954
if tuple.len() != 2 {
955955
return Err(vm
956-
.new_type_error(
957-
"AF_INET address must be a pair (host, post)",
958-
)
956+
.new_type_error("AF_INET address must be a pair (host, post)")
959957
.into());
960958
}
961959
let addr = Address::from_tuple(&tuple, vm)?;
@@ -1244,9 +1242,7 @@ mod _socket {
12441242
vm.new_value_error("negative buffersize in recvfrom_into")
12451243
})?;
12461244
buf.get_mut(..i).ok_or_else(|| {
1247-
vm.new_value_error(
1248-
"nbytes is greater than the length of the buffer",
1249-
)
1245+
vm.new_value_error("nbytes is greater than the length of the buffer")
12501246
})?
12511247
}
12521248
OptionalArg::Missing => buf,
@@ -1315,9 +1311,9 @@ mod _socket {
13151311
let (flags, address) = match arg3 {
13161312
OptionalArg::Present(arg3) => {
13171313
// should just be i32::try_from_obj but tests check for error message
1318-
let int = arg2.try_index_opt(vm).unwrap_or_else(|| {
1319-
Err(vm.new_type_error("an integer is required"))
1320-
})?;
1314+
let int = arg2
1315+
.try_index_opt(vm)
1316+
.unwrap_or_else(|| Err(vm.new_type_error("an integer is required")))?;
13211317
let flags = int.try_to_primitive::<i32>(vm)?;
13221318
(flags, arg3)
13231319
}
@@ -1368,9 +1364,9 @@ mod _socket {
13681364
&ancdata,
13691365
|obj| -> PyResult<(i32, i32, ArgBytesLike)> {
13701366
let seq: Vec<PyObjectRef> = obj.try_into_value(vm)?;
1371-
let [lvl, typ, data]: [PyObjectRef; 3] = seq.try_into().map_err(|_| {
1372-
vm.new_type_error("expected a sequence of length 3")
1373-
})?;
1367+
let [lvl, typ, data]: [PyObjectRef; 3] = seq
1368+
.try_into()
1369+
.map_err(|_| vm.new_type_error("expected a sequence of length 3"))?;
13741370
Ok((
13751371
lvl.try_into_value(vm)?,
13761372
typ.try_into_value(vm)?,
@@ -1779,9 +1775,9 @@ mod _socket {
17791775
protocolname: OptionalArg<PyStrRef>,
17801776
vm: &VirtualMachine,
17811777
) -> PyResult<String> {
1782-
let port = port.to_u16().ok_or_else(|| {
1783-
vm.new_overflow_error("getservbyport: port must be 0-65535.")
1784-
})?;
1778+
let port = port
1779+
.to_u16()
1780+
.ok_or_else(|| vm.new_overflow_error("getservbyport: port must be 0-65535."))?;
17851781
let cstr_proto = protocolname
17861782
.as_ref()
17871783
.map(|s| s.to_cstring(vm))
@@ -2060,9 +2056,7 @@ mod _socket {
20602056
match address.len() {
20612057
2..=4 => {}
20622058
_ => {
2063-
return Err(vm
2064-
.new_type_error("illegal sockaddr argument")
2065-
.into());
2059+
return Err(vm.new_type_error("illegal sockaddr argument").into());
20662060
}
20672061
}
20682062
let (addr, flowinfo, scopeid) = Address::from_tuple_ipv6(&address, vm)?;

0 commit comments

Comments
 (0)