diff --git a/crates/rustc_codegen_spirv/src/codegen_cx/mod.rs b/crates/rustc_codegen_spirv/src/codegen_cx/mod.rs index 633068bcdb..28f656d8f4 100644 --- a/crates/rustc_codegen_spirv/src/codegen_cx/mod.rs +++ b/crates/rustc_codegen_spirv/src/codegen_cx/mod.rs @@ -671,11 +671,11 @@ impl<'tcx> CoverageInfoMethods<'tcx> for CodegenCx<'tcx> { } } -impl<'tcx> AsmMethods for CodegenCx<'tcx> { +impl<'tcx> AsmMethods<'tcx> for CodegenCx<'tcx> { fn codegen_global_asm( &self, _template: &[InlineAsmTemplatePiece], - _operands: &[GlobalAsmOperandRef], + _operands: &[GlobalAsmOperandRef<'tcx>], _options: InlineAsmOptions, _line_spans: &[Span], ) { diff --git a/rust-toolchain b/rust-toolchain index d17dd544de..c9a3ef5670 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -5,5 +5,5 @@ # to the user in the error, instead of "error: invalid channel name '[toolchain]'". [toolchain] -channel = "nightly-2022-08-15" +channel = "nightly-2022-04-18" components = ["rust-src", "rustc-dev", "llvm-tools-preview"]