Upgrade Rust toolchain to 1.84.0 (#10533)
## Summary Upgrade the rust toolchain to 1.84.0. This PR does not bump the MSRV.
This commit is contained in:
@@ -1154,7 +1154,7 @@ pub(crate) fn is_windows_store_shim(path: &Path) -> bool {
|
||||
component.starts_with("python")
|
||||
&& std::path::Path::new(component)
|
||||
.extension()
|
||||
.map_or(false, |ext| ext.eq_ignore_ascii_case("exe"))
|
||||
.is_some_and(|ext| ext.eq_ignore_ascii_case("exe"))
|
||||
})
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -78,12 +78,12 @@ impl PythonInstallation {
|
||||
/// Find or fetch a [`PythonInstallation`].
|
||||
///
|
||||
/// Unlike [`PythonInstallation::find`], if the required Python is not installed it will be installed automatically.
|
||||
pub async fn find_or_download<'a>(
|
||||
pub async fn find_or_download(
|
||||
request: Option<&PythonRequest>,
|
||||
environments: EnvironmentPreference,
|
||||
preference: PythonPreference,
|
||||
python_downloads: PythonDownloads,
|
||||
client_builder: &BaseClientBuilder<'a>,
|
||||
client_builder: &BaseClientBuilder<'_>,
|
||||
cache: &Cache,
|
||||
reporter: Option<&dyn Reporter>,
|
||||
python_install_mirror: Option<&str>,
|
||||
@@ -127,9 +127,9 @@ impl PythonInstallation {
|
||||
}
|
||||
|
||||
/// Download and install the requested installation.
|
||||
pub async fn fetch<'a>(
|
||||
pub async fn fetch(
|
||||
request: PythonDownloadRequest,
|
||||
client_builder: &BaseClientBuilder<'a>,
|
||||
client_builder: &BaseClientBuilder<'_>,
|
||||
cache: &Cache,
|
||||
reporter: Option<&dyn Reporter>,
|
||||
python_install_mirror: Option<&str>,
|
||||
|
||||
@@ -894,10 +894,10 @@ mod tests {
|
||||
|
||||
fs::write(
|
||||
&mocked_interpreter,
|
||||
formatdoc! {r##"
|
||||
formatdoc! {r"
|
||||
#!/bin/bash
|
||||
echo '{json}'
|
||||
"##},
|
||||
"},
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
@@ -913,10 +913,10 @@ mod tests {
|
||||
);
|
||||
fs::write(
|
||||
&mocked_interpreter,
|
||||
formatdoc! {r##"
|
||||
formatdoc! {r"
|
||||
#!/bin/bash
|
||||
echo '{}'
|
||||
"##, json.replace("3.12", "3.13")},
|
||||
", json.replace("3.12", "3.13")},
|
||||
)
|
||||
.unwrap();
|
||||
let interpreter = Interpreter::query(&mocked_interpreter, &cache).unwrap();
|
||||
|
||||
@@ -282,10 +282,10 @@ mod tests {
|
||||
fs_err::create_dir_all(path.parent().unwrap())?;
|
||||
fs_err::write(
|
||||
path,
|
||||
formatdoc! {r##"
|
||||
formatdoc! {r"
|
||||
#!/bin/bash
|
||||
echo '{json}'
|
||||
"##},
|
||||
"},
|
||||
)?;
|
||||
|
||||
fs_err::set_permissions(path, std::os::unix::fs::PermissionsExt::from_mode(0o770))?;
|
||||
@@ -304,10 +304,10 @@ mod tests {
|
||||
|
||||
fs_err::write(
|
||||
path,
|
||||
formatdoc! {r##"
|
||||
formatdoc! {r"
|
||||
#!/bin/bash
|
||||
echo '{output}' 1>&2
|
||||
"##},
|
||||
"},
|
||||
)?;
|
||||
|
||||
fs_err::set_permissions(path, std::os::unix::fs::PermissionsExt::from_mode(0o770))?;
|
||||
@@ -525,10 +525,10 @@ mod tests {
|
||||
#[cfg(unix)]
|
||||
fs_err::write(
|
||||
children[0].join(format!("python{}", env::consts::EXE_SUFFIX)),
|
||||
formatdoc! {r##"
|
||||
formatdoc! {r"
|
||||
#!/bin/bash
|
||||
echo 'foo'
|
||||
"##},
|
||||
"},
|
||||
)?;
|
||||
fs_err::set_permissions(
|
||||
children[0].join(format!("python{}", env::consts::EXE_SUFFIX)),
|
||||
|
||||
Reference in New Issue
Block a user