Skip to content

Commit cc33fe9

Browse files
ShaharNavehShaharNaveh
committed
Remove redundunt to_owned() calls
1 parent 65dee6c commit cc33fe9

18 files changed

Lines changed: 42 additions & 54 deletions

File tree

‎crates/capi/src/abstract_.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,7 @@ pub unsafe extern "C" fn PyObject_VectorcallMethod(
100100
let args_len = nargsf & !PY_VECTORCALL_ARGUMENTS_OFFSET;
101101

102102
if args_len == 0 {
103-
return Err(
104-
vm.new_system_error("PyObject_VectorcallMethod called with no receiver".to_owned())
105-
);
103+
return Err(vm.new_system_error("PyObject_VectorcallMethod called with no receiver"));
106104
}
107105

108106
let (receiver, args) = unsafe { slice::from_raw_parts(args, args_len) }

‎crates/capi/src/unicodeobject.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ pub unsafe extern "C" fn PyUnicode_FromEncodedObject(
158158
let obj = unsafe { &*obj };
159159

160160
if obj.downcast_ref::<PyStr>().is_some() {
161-
return Err(vm.new_type_error("decoding str is not supported".to_owned()));
161+
return Err(vm.new_type_error("decoding str is not supported"));
162162
}
163163

164164
let encoding = if encoding.is_null() {

‎crates/stdlib/src/multiprocessing.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ mod _multiprocessing {
496496
let timeout: f64 = timeout_obj.try_float(vm)?.to_f64();
497497
Some(
498498
host_multiprocessing::deadline_from_timeout(timeout)
499-
.map_err(|_| vm.new_os_error("gettimeofday failed".to_string()))?,
499+
.map_err(|_| vm.new_os_error("gettimeofday failed"))?,
500500
)
501501
} else {
502502
None

‎crates/stdlib/src/select.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ mod decl {
393393
return Err(vm.new_value_error("negative sizehint"));
394394
}
395395
if !matches!(args.flags, 0 | libc::EPOLL_CLOEXEC) {
396-
return Err(vm.new_os_error("invalid flags".to_owned()));
396+
return Err(vm.new_os_error("invalid flags"));
397397
}
398398
Self::new().map_err(|e| e.into_pyexception(vm))
399399
}

‎crates/stdlib/src/socket.rs‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ mod _socket {
11231123
ArgStrOrBytesLike::Str(s) => vm.fsencode(s)?,
11241124
};
11251125
socket2::SockAddr::unix(path)
1126-
.map_err(|_| vm.new_os_error("AF_UNIX path too long".to_owned()).into())
1126+
.map_err(|_| vm.new_os_error("AF_UNIX path too long").into())
11271127
}
11281128
c::AF_INET => {
11291129
let tuple: PyTupleRef = addr.downcast().map_err(|obj| {
@@ -1206,12 +1206,10 @@ mod _socket {
12061206
} else {
12071207
// Check interface name length (IFNAMSIZ is typically 16)
12081208
if ifname.len() >= 16 {
1209-
return Err(vm
1210-
.new_os_error("interface name too long".to_owned())
1211-
.into());
1209+
return Err(vm.new_os_error("interface name too long").into());
12121210
}
12131211
let cstr = alloc::ffi::CString::new(ifname)
1214-
.map_err(|_| vm.new_os_error("invalid interface name".to_owned()))?;
1212+
.map_err(|_| vm.new_os_error("invalid interface name"))?;
12151213
host_socket::if_nametoindex_checked(cstr.as_c_str())? as i32
12161214
};
12171215

@@ -2052,9 +2050,7 @@ mod _socket {
20522050
Ok(vm.ctx.new_int(flag).into())
20532051
} else {
20542052
if buflen <= 0 || buflen > 1024 {
2055-
return Err(vm
2056-
.new_os_error("getsockopt buflen out of range".to_owned())
2057-
.into());
2053+
return Err(vm.new_os_error("getsockopt buflen out of range").into());
20582054
}
20592055
let buf = host_socket::getsockopt_bytes(fd as _, level, name, buflen as usize)?;
20602056
Ok(vm.ctx.new_bytes(buf).into())
@@ -2341,16 +2337,14 @@ mod _socket {
23412337
.as_str()
23422338
.parse::<Ipv4Addr>()
23432339
.map(|ip_addr| Vec::<u8>::from(ip_addr.octets()))
2344-
.map_err(|_| {
2345-
vm.new_os_error("illegal IP address string passed to inet_aton".to_owned())
2346-
})
2340+
.map_err(|_| vm.new_os_error("illegal IP address string passed to inet_aton"))
23472341
}
23482342

23492343
#[pyfunction]
23502344
fn inet_ntoa(packed_ip: ArgBytesLike, vm: &VirtualMachine) -> PyResult<PyStrRef> {
23512345
let packed_ip = packed_ip.borrow_buf();
23522346
let packed_ip = <&[u8; 4]>::try_from(&*packed_ip)
2353-
.map_err(|_| vm.new_os_error("packed IP wrong length for inet_ntoa".to_owned()))?;
2347+
.map_err(|_| vm.new_os_error("packed IP wrong length for inet_ntoa"))?;
23542348
Ok(vm.ctx.new_str(Ipv4Addr::from(*packed_ip).to_string()))
23552349
}
23562350

@@ -2372,7 +2366,7 @@ mod _socket {
23722366
let cstr_proto = cstr_opt_as_ptr(&cstr_proto);
23732367
let serv = unsafe { c::getservbyname(cstr_name.as_ptr() as _, cstr_proto as _) };
23742368
if serv.is_null() {
2375-
return Err(vm.new_os_error("service/proto not found".to_owned()));
2369+
return Err(vm.new_os_error("service/proto not found"));
23762370
}
23772371
let port = unsafe { (*serv).s_port };
23782372
Ok(u16::from_be(port as u16))
@@ -2394,7 +2388,7 @@ mod _socket {
23942388
let cstr_proto = cstr_opt_as_ptr(&cstr_proto);
23952389
let serv = unsafe { c::getservbyport(port.to_be() as _, cstr_proto as _) };
23962390
if serv.is_null() {
2397-
return Err(vm.new_os_error("port/proto not found".to_owned()));
2391+
return Err(vm.new_os_error("port/proto not found"));
23982392
}
23992393
let s = unsafe { ffi::CStr::from_ptr((*serv).s_name as _) };
24002394
Ok(s.to_string_lossy().into_owned())
@@ -2729,7 +2723,7 @@ mod _socket {
27292723
.map_err(|_| vm.new_os_error(ERROR_MSG.to_owned()))?
27302724
.octets()
27312725
.to_vec(),
2732-
_ => return Err(vm.new_os_error("Address family not supported by protocol".to_owned())),
2726+
_ => return Err(vm.new_os_error("Address family not supported by protocol")),
27332727
};
27342728
Ok(ip_addr)
27352729
}
@@ -2759,7 +2753,7 @@ mod _socket {
27592753
let cstr = name.to_cstring(vm)?;
27602754
let proto = unsafe { c::getprotobyname(cstr.as_ptr() as _) };
27612755
if proto.is_null() {
2762-
return Err(vm.new_os_error("protocol not found".to_owned()));
2756+
return Err(vm.new_os_error("protocol not found"));
27632757
}
27642758
let num = unsafe { (*proto).p_proto };
27652759
Ok(vm.ctx.new_int(num).into())
@@ -2792,15 +2786,13 @@ mod _socket {
27922786
let mut ainfo = res.next().unwrap();
27932787
if res.next().is_some() {
27942788
return Err(vm
2795-
.new_os_error("sockaddr resolved to multiple addresses".to_owned())
2789+
.new_os_error("sockaddr resolved to multiple addresses")
27962790
.into());
27972791
}
27982792
match &mut ainfo.sockaddr {
27992793
SocketAddr::V4(_) => {
28002794
if address.len() != 2 {
2801-
return Err(vm
2802-
.new_os_error("IPv4 sockaddr must be 2 tuple".to_owned())
2803-
.into());
2795+
return Err(vm.new_os_error("IPv4 sockaddr must be 2 tuple").into());
28042796
}
28052797
}
28062798
SocketAddr::V6(addr) => {
@@ -2931,7 +2923,7 @@ mod _socket {
29312923
let ainfo = res.next().unwrap()?;
29322924
if res.next().is_some() {
29332925
return Err(vm
2934-
.new_os_error("wildcard resolved to multiple address".to_owned())
2926+
.new_os_error("wildcard resolved to multiple address")
29352927
.into());
29362928
}
29372929
return Ok(ainfo.sockaddr);
@@ -2940,9 +2932,7 @@ mod _socket {
29402932
match af {
29412933
c::AF_INET | c::AF_UNSPEC => {}
29422934
_ => {
2943-
return Err(vm
2944-
.new_os_error("address family mismatched".to_owned())
2945-
.into());
2935+
return Err(vm.new_os_error("address family mismatched").into());
29462936
}
29472937
}
29482938
return Ok(SocketAddr::V4(net::SocketAddrV4::new(

‎crates/stdlib/src/ssl.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2824,7 +2824,7 @@ mod _ssl {
28242824
) -> PyResult<PyBytesRef> {
28252825
let obj_to_bytes = |bytes_obj| {
28262826
PyBytesRef::try_from_object(vm, bytes_obj)
2827-
.map_err(|_| vm.new_os_error("Expected bytes from recv".to_string()))
2827+
.map_err(|_| vm.new_os_error("Expected bytes from recv"))
28282828
};
28292829

28302830
let tls_record_header_buf = self

‎crates/vm/src/builtins/code.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ impl PyCode {
536536
}
537537
#[cfg(not(feature = "host_env"))]
538538
pub fn from_pyc_path(_path: &std::path::Path, vm: &VirtualMachine) -> PyResult<PyRef<Self>> {
539-
Err(vm.new_runtime_error("loading a pyc file requires the `host_env` feature".to_owned()))
539+
Err(vm.new_runtime_error("loading a pyc file requires the `host_env` feature"))
540540
}
541541
pub fn from_pyc(
542542
pyc_bytes: &[u8],

‎crates/vm/src/builtins/function.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,10 +1253,10 @@ impl Constructor for PyBoundMethod {
12531253
vm: &VirtualMachine,
12541254
) -> PyResult<Self> {
12551255
if !function.is_callable() {
1256-
return Err(vm.new_type_error("first argument must be callable".to_owned()));
1256+
return Err(vm.new_type_error("first argument must be callable"));
12571257
}
12581258
if vm.is_none(&object) {
1259-
return Err(vm.new_type_error("instance must not be None".to_owned()));
1259+
return Err(vm.new_type_error("instance must not be None"));
12601260
}
12611261
Ok(Self::new(object, function))
12621262
}

‎crates/vm/src/builtins/list.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ impl PyList {
295295
.setitem_by_index(vm, index, value)
296296
.map_err(|e| {
297297
if e.class().is(vm.ctx.exceptions.index_error) {
298-
vm.new_index_error("list assignment index out of range".to_owned())
298+
vm.new_index_error("list assignment index out of range")
299299
} else {
300300
e
301301
}

‎crates/vm/src/exceptions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2536,7 +2536,7 @@ pub(super) mod types {
25362536
4 | 6 => {}
25372537
5 => {
25382538
return Err(vm.new_type_error(
2539-
"end_offset must be provided when end_lineno is provided".to_owned(),
2539+
"end_offset must be provided when end_lineno is provided",
25402540
));
25412541
}
25422542
_ => {

0 commit comments

Comments
 (0)