Merge commit '0969bc6dde001e01e7e1f58c8ccd7750f8a49ae1' into sync_cg_clif-2021-03-29

2021-03-29 10:45:09 +02:00
parent cc4103089f 0969bc6dde
commit 5444b46234
49 changed files with 880 additions and 495 deletions
--- a/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs
+++ b/compiler/rustc_codegen_cranelift/src/debuginfo/line_info.rs
@@ -39,11 +39,11 @@ fn osstr_as_utf8_bytes(path: &OsStr) -> &[u8] {
    #[cfg(unix)]
    {
        use std::os::unix::ffi::OsStrExt;
-        return path.as_bytes();
+        path.as_bytes()
    }
    #[cfg(not(unix))]
    {
-        return path.to_str().unwrap().as_bytes();
+        path.to_str().unwrap().as_bytes()
    }
 }