Upgrade minimum Rust version to 1.83 (#9815)

This reverts commit 6cc7a560f7 to reapply
#9511 since we've disabled ppc64le-musl per #9793
This commit is contained in:
Zanie Blue 2024-12-11 10:06:19 -06:00 committed by GitHub
parent f64da9b763
commit ae25c2f4db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 72 additions and 65 deletions

View file

@ -1193,17 +1193,17 @@ pub(crate) fn is_windows_store_shim(path: &Path) -> bool {
}
// Ex) `WindowsApps`
if !components
if components
.next()
.is_some_and(|component| component.as_os_str() == "WindowsApps")
.is_none_or(|component| component.as_os_str() != "WindowsApps")
{
return false;
}
// Ex) `Microsoft`
if !components
if components
.next()
.is_some_and(|component| component.as_os_str() == "Microsoft")
.is_none_or(|component| component.as_os_str() != "Microsoft")
{
return false;
}

View file

@ -89,7 +89,7 @@ impl PythonInstallation {
python_install_mirror: Option<&str>,
pypy_install_mirror: Option<&str>,
) -> Result<Self, Error> {
let request = request.unwrap_or_else(|| &PythonRequest::Default);
let request = request.unwrap_or(&PythonRequest::Default);
// Search for the installation
match Self::find(request, environments, preference, cache) {