Merge pull request #3292 from dylanahsmith/fix-RUSTUP_PERMIT_COPY_RENAME

rbtcollins · web-flow · commit 7d6fe1a78d62 · 2023-03-30T09:14:56.000+02:00
Fix RUSTUP_PERMIT_COPY_RENAME condition so it is actually used
diff --git a/src/utils/utils.rs b/src/utils/utils.rs
@@ -622,9 +622,8 @@ where
                     OperationResult::Retry(e)
                 }
                 #[cfg(target_os = "linux")]
-                io::ErrorKind::Other
-                    if process().var_os("RUSTUP_PERMIT_COPY_RENAME").is_some()
-                        && Some(EXDEV) == e.raw_os_error() =>
+                _ if process().var_os("RUSTUP_PERMIT_COPY_RENAME").is_some()
+                    && Some(EXDEV) == e.raw_os_error() =>
                 {
                     match copy_and_delete(name, src, dest, notify_handler) {
                         Ok(()) => OperationResult::Ok(()),

Original file line number	Diff line number	Diff line change
`@@ -622,9 +622,8 @@ where`
`622`	`622`	`OperationResult::Retry(e)`
`623`	`623`	`}`
`624`	`624`	`#[cfg(target_os = "linux")]`
`625`		`- io::ErrorKind::Other`
`626`		`- if process().var_os("RUSTUP_PERMIT_COPY_RENAME").is_some()`
`627`		`- && Some(EXDEV) == e.raw_os_error() =>`
	`625`	`+ _ if process().var_os("RUSTUP_PERMIT_COPY_RENAME").is_some()`
	`626`	`+ && Some(EXDEV) == e.raw_os_error() =>`
`628`	`627`	`{`
`629`	`628`	`match copy_and_delete(name, src, dest, notify_handler) {`
`630`	`629`	`Ok(()) => OperationResult::Ok(()),`