Updated arguments and return types

Author: dvdplm

crates/rustc_codegen_spirv/src/lib.rs

@@ -304,9 +304,6 @@ impl ThinBufferMethods for SpirvModuleBuffer {
     fn data(&self) -> &[u8] {
         self.as_bytes()
     }
-    // fn thin_link_data(&self) -> &[u8] {
-    //     &[]
-    // }
 }
 
 impl SpirvCodegenBackend {
@@ -344,7 +341,6 @@ impl WriteBackendMethods for SpirvCodegenBackend {
         _exported_symbols_for_lto: &[String],
         _each_linked_rlib_for_lto: &[PathBuf],
         _modules: Vec<FatLtoInput<Self>>,
-        // _diff_fncs: Vec<AutoDiffItem>,
     ) -> ModuleCodegen<Self::Module> {
         assert!(
             cgcx.lto == rustc_session::config::Lto::Fat,

crates/rustc_codegen_spirv/src/link.rs

@@ -494,6 +494,7 @@ fn add_upstream_native_libraries(
 // FIXME(eddyb) upstream has code like this already, maybe we can reuse most of it?
 // (see `compiler/rustc_codegen_ssa/src/back/link.rs`)
 fn relevant_lib(_sess: &Session, _lib: &NativeLib) -> bool {
+    // FIXME: `lib.cfg` is not of the expected type any more.
     true
     // match lib.cfg {
     //     Some(ref cfg) => rustc_attr_parsing::cfg_matches(cfg, sess, CRATE_NODE_ID, None),

crates/rustc_codegen_spirv/src/linker/test.rs

@@ -156,7 +156,6 @@ fn link_with_linker_opts(
                 rustc_interface::util::rustc_version_str().unwrap_or("unknown"),
                 Default::default(),
                 &rustc_driver_impl::USING_INTERNAL_FEATURES,
-                // Default::default(),
             );
 
             // HACK(eddyb) inject `write_diags` into `sess`, to work around