Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to nightly-2022-04-18 #909

Merged
merged 6 commits into from
Aug 17, 2022
Merged

Updated to nightly-2022-04-18 #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6fe809
Update rust-toolchain
oisyn Aug 16, 2022
c36ed62
Update to 2022-04-18
oisyn Aug 17, 2022
679eae6
Removed +stable workaround
oisyn Aug 17, 2022
1ccb0d2
Updated libc to latest in Cargo.lock
oisyn Aug 17, 2022
847f2f6
Updated test result
oisyn Aug 17, 2022
78070d4
Merge branch 'main' into new-nightly
oisyn Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,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"
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/rustc_codegen_spirv/src/codegen_cx/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
) {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-04-18"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
65 changes: 45 additions & 20 deletions tests/ui/arch/debug_printf_type_checking.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<T>(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<T>(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<f32, 2_usize>` is not satisfied
--> $DIR/debug_printf_type_checking.rs:22:31
Expand Down Expand Up @@ -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<T>(ty: T) -> T {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 14 previous errors

Expand Down