diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2025-07-18 22:35:30 +0200 |
|---|---|---|
| committer | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2025-07-18 22:35:58 +0200 |
| commit | f16474f7bf0419de39db82fcf2f308cb42c2997d (patch) | |
| tree | f8c1e712905331ce19912b4ac6c77c3717b0dedc /compiler/rustc_codegen_gcc | |
| parent | 66017df336ae650c7fff2970e470a792036ba4be (diff) | |
| download | rust-f16474f7bf0419de39db82fcf2f308cb42c2997d.tar.gz rust-f16474f7bf0419de39db82fcf2f308cb42c2997d.zip | |
Remove forgotten git annotations
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs b/compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs index 358f265a6b8..85489f850e2 100644 --- a/compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs +++ b/compiler/rustc_codegen_gcc/example/mini_core_hello_world.rs @@ -198,12 +198,6 @@ fn main() { assert_eq!(intrinsics::align_of::<u16>() as u8, 2); assert_eq!(intrinsics::align_of_val(&a) as u8, intrinsics::align_of::<&str>() as u8); -<<<<<<< HEAD - assert!(!const { intrinsics::needs_drop::<u8>() }); - assert!(!const { intrinsics::needs_drop::<[u8]>() }); - assert!(const { intrinsics::needs_drop::<NoisyDrop>() }); - assert!(const { intrinsics::needs_drop::<NoisyDropUnsized>() }); -======= /* * TODO: re-enable in the next sync. let u8_needs_drop = const { intrinsics::needs_drop::<u8>() }; @@ -215,7 +209,6 @@ fn main() { let noisy_unsized_drop = const { intrinsics::needs_drop::<NoisyDropUnsized>() }; assert!(noisy_unsized_drop); */ ->>>>>>> f682d09eefc6700b9e5851ef193847959acf4fac Unique { pointer: 0 as *const &str, |