From e6fe809f17f208ddf6dfde69383913acfe56d933 Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Tue, 16 Aug 2022 15:17:20 +0200 Subject: [PATCH 1/5] Update rust-toolchain --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 508709959b..d17dd544de 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-04-11" +channel = "nightly-2022-08-15" components = ["rust-src", "rustc-dev", "llvm-tools-preview"] From c36ed622eb2ff67ab0f59a4289af94872ab0af0a Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Wed, 17 Aug 2022 14:08:28 +0200 Subject: [PATCH 2/5] Update to 2022-04-18 --- crates/rustc_codegen_spirv/src/codegen_cx/mod.rs | 4 ++-- rust-toolchain | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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"] From 679eae688e226f96b4f411acd02b5dd5cdf91fc4 Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Wed, 17 Aug 2022 15:17:06 +0200 Subject: [PATCH 3/5] Removed +stable workaround Not needed anymore as libc is is no longer giving issues with this nightly version --- .github/workflows/ci.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7f3582f7de..4f4f9e9e04 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -94,8 +94,7 @@ jobs: echo "::endgroup::" echo "::group::Install cargo-apk" - echo "FIXME(eddyb) working around libc 0.2.127 breakage by using stable Rust!" - cargo +stable install cargo-apk + cargo install cargo-apk echo "::endgroup::" echo "::group::Add aarch64-linux-android target" From 1ccb0d2672fd1317ea62566718359381b80d61ab Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Wed, 17 Aug 2022 15:19:30 +0200 Subject: [PATCH 4/5] Updated libc to latest in Cargo.lock --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 92c9c4772a..927e6219c2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,9 +1182,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.112" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "libloading" From 847f2f67b5bf99a7cec44dca78f61fa088ec11ad Mon Sep 17 00:00:00 2001 From: Sylvester Hesp Date: Wed, 17 Aug 2022 15:36:08 +0200 Subject: [PATCH 5/5] Updated test result --- .../ui/arch/debug_printf_type_checking.stderr | 65 +++++++++++++------ 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/tests/ui/arch/debug_printf_type_checking.stderr b/tests/ui/arch/debug_printf_type_checking.stderr index d422023e6b..c29a7a9aac 100644 --- a/tests/ui/arch/debug_printf_type_checking.stderr +++ b/tests/ui/arch/debug_printf_type_checking.stderr @@ -59,26 +59,42 @@ error: Unrecognised format specifier: 'r' | ^^^^ error[E0308]: mismatched types - --> $DIR/debug_printf_type_checking.rs:20:29 - | -20 | debug_printf!("%f", 11_u32); - | ^^^^^^ expected `f32`, found `u32` - | + --> $DIR/debug_printf_type_checking.rs:20:29 + | +20 | debug_printf!("%f", 11_u32); + | --------------------^^^^^^- + | | | + | | expected `f32`, found `u32` + | arguments to this function are incorrect + | +note: function defined here + --> $SPIRV_STD_SRC/lib.rs:138:8 + | +138 | pub fn debug_printf_assert_is_type(ty: T) -> T { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: change the type of the numeric literal from `u32` to `f32` - | -20 | debug_printf!("%f", 11_f32); - | ~~~ + | +20 | debug_printf!("%f", 11_f32); + | ~~~ error[E0308]: mismatched types - --> $DIR/debug_printf_type_checking.rs:21:29 - | -21 | debug_printf!("%u", 11.0_f32); - | ^^^^^^^^ expected `u32`, found `f32` - | + --> $DIR/debug_printf_type_checking.rs:21:29 + | +21 | debug_printf!("%u", 11.0_f32); + | --------------------^^^^^^^^- + | | | + | | expected `u32`, found `f32` + | arguments to this function are incorrect + | +note: function defined here + --> $SPIRV_STD_SRC/lib.rs:138:8 + | +138 | pub fn debug_printf_assert_is_type(ty: T) -> T { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: change the type of the numeric literal from `f32` to `u32` - | -21 | debug_printf!("%u", 11u32); - | ~~~ + | +21 | debug_printf!("%u", 11u32); + | ~~~ error[E0277]: the trait bound `{float}: Vector` is not satisfied --> $DIR/debug_printf_type_checking.rs:22:31 @@ -106,10 +122,19 @@ note: required by a bound in `debug_printf_assert_is_vector` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `debug_printf_assert_is_vector` error[E0308]: mismatched types - --> $DIR/debug_printf_type_checking.rs:23:29 - | -23 | debug_printf!("%f", Vec2::splat(33.3)); - | ^^^^^^^^^^^^^^^^^ expected `f32`, found struct `Vec2` + --> $DIR/debug_printf_type_checking.rs:23:29 + | +23 | debug_printf!("%f", Vec2::splat(33.3)); + | --------------------^^^^^^^^^^^^^^^^^- + | | | + | | expected `f32`, found struct `Vec2` + | arguments to this function are incorrect + | +note: function defined here + --> $SPIRV_STD_SRC/lib.rs:138:8 + | +138 | pub fn debug_printf_assert_is_type(ty: T) -> T { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ error: aborting due to 14 previous errors