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:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user