More consistent use of qualified paths

Author: bjorn3

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -3,7 +3,7 @@ mod raw_dylib;
 use std::collections::BTreeSet;
 use std::ffi::OsString;
 use std::fs::{File, OpenOptions, read};
-use std::io::{BufWriter, Write};
+use std::io::{BufReader, BufWriter, Write};
 use std::ops::{ControlFlow, Deref};
 use std::path::{Path, PathBuf};
 use std::process::{ExitStatus, Output, Stdio};
@@ -3439,37 +3439,36 @@ fn add_lld_args(
 // Additionally, gold miscompiles SHF_GNU_RETAIN sections, which are
 // emitted with `#[used(linker)]`.
 fn warn_if_linked_with_gold(sess: &Session, path: &Path) -> Result<(), Box<dyn std::error::Error>> {
-    fn elf_has_gold_version_note<'a>(
-        elf: &impl object::read::elf::FileHeader,
-        data: impl object::read::ReadRef<'a>,
-    ) -> Result<bool, Box<dyn std::error::Error>> {
-        use object::read::elf::SectionHeader;
+    use object::read::elf::{FileHeader, SectionHeader};
+    use object::read::{ReadCache, ReadRef, Result};
+    use object::{Endianness, elf};
 
+    fn elf_has_gold_version_note<'a>(
+        elf: &impl FileHeader,
+        data: impl ReadRef<'a>,
+    ) -> Result<bool> {
         let endian = elf.endian()?;
 
         let section =
             elf.sections(endian, data)?.section_by_name(endian, b".note.gnu.gold-version");
         if let Some((_, section)) = section {
             if let Some(mut notes) = section.notes(endian, data)? {
                 return Ok(notes.any(|note| {
-                    note.is_ok_and(|note| note.n_type(endian) == object::elf::NT_GNU_GOLD_VERSION)
+                    note.is_ok_and(|note| note.n_type(endian) == elf::NT_GNU_GOLD_VERSION)
                 }));
             }
         }
 
         Ok(false)
     }
 
-    use object::elf;
-    use object::read::elf::FileHeader;
-
-    let data = object::read::ReadCache::new(std::io::BufReader::new(std::fs::File::open(path)?));
+    let data = ReadCache::new(BufReader::new(File::open(path)?));
 
     let was_linked_with_gold = if sess.target.pointer_width == 64 {
-        let elf = elf::FileHeader64::<object::Endianness>::parse(&data)?;
+        let elf = elf::FileHeader64::<Endianness>::parse(&data)?;
         elf_has_gold_version_note(elf, &data)?
     } else if sess.target.pointer_width == 32 {
-        let elf = elf::FileHeader32::<object::Endianness>::parse(&data)?;
+        let elf = elf::FileHeader32::<Endianness>::parse(&data)?;
         elf_has_gold_version_note(elf, &data)?
     } else {
         return Ok(());