Unrolled build for rust-lang#125919

rust-timer · web-flow · commit 1291b2255355 · 2024-06-04T07:50:32.000-04:00
Rollup merge of rust-lang#125919 - tbu-:pr_fix_typo, r=lqd Remove stray "this"
diff --git a/library/std/src/sys/pal/unix/fs.rs b/library/std/src/sys/pal/unix/fs.rs
@@ -1910,8 +1910,7 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {
             // The code below ensures that `FreeOnDrop` is never a null pointer
             unsafe {
                 // `copyfile_state_free` returns -1 if the `to` or `from` files
-                // cannot be closed. However, this is not considered this an
-                // error.
+                // cannot be closed. However, this is not considered an error.
                 libc::copyfile_state_free(self.0);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -1910,8 +1910,7 @@ pub fn copy(from: &Path, to: &Path) -> io::Result<u64> {`
`1910`	`1910`	// The code below ensures that `FreeOnDrop` is never a null pointer
`1911`	`1911`	`unsafe {`
`1912`	`1912`	// `copyfile_state_free` returns -1 if the `to` or `from` files
`1913`		`- // cannot be closed. However, this is not considered this an`
`1914`		`- // error.`
	`1913`	`+ // cannot be closed. However, this is not considered an error.`
`1915`	`1914`	`libc::copyfile_state_free(self.0);`
`1916`	`1915`	`}`
`1917`	`1916`	`}`