diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2025-04-18 21:21:15 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2025-04-18 21:21:15 +0200 |
| commit | c123dc63ea5f765488e4d56aa55bf4467fce7d27 (patch) | |
| tree | d9044c953b8375bc045f1f65c00445318e745cdb | |
| parent | e4ea67b3d79bb8d9dbab383ec93edc4ea8cc8df4 (diff) | |
| download | rust-c123dc63ea5f765488e4d56aa55bf4467fce7d27.tar.gz rust-c123dc63ea5f765488e4d56aa55bf4467fce7d27.zip | |
Fix `rustc_codegen_gcc/tests/run/return-tuple.rs` test
| -rw-r--r-- | compiler/rustc_codegen_gcc/tests/run/return-tuple.rs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_gcc/tests/run/return-tuple.rs b/compiler/rustc_codegen_gcc/tests/run/return-tuple.rs index c6e1ba7ce39..c1254c51ce9 100644 --- a/compiler/rustc_codegen_gcc/tests/run/return-tuple.rs +++ b/compiler/rustc_codegen_gcc/tests/run/return-tuple.rs @@ -6,13 +6,7 @@ // 10 // 42 -<<<<<<< HEAD -#![feature(auto_traits, lang_items, no_core, intrinsics)] -#![allow(internal_features)] - -======= #![feature(no_core)] ->>>>>>> db1a31c243a649e1fe20f5466ba181da5be35c14 #![no_std] #![no_core] #![no_main] |