diff options
| -rw-r--r-- | build_system/src/build.rs | 2 | ||||
| -rw-r--r-- | example/mini_core_hello_world.rs | 17 |
2 files changed, 12 insertions, 7 deletions
diff --git a/build_system/src/build.rs b/build_system/src/build.rs index 8c09ea3ba42..4033ffe0694 100644 --- a/build_system/src/build.rs +++ b/build_system/src/build.rs @@ -95,8 +95,6 @@ fn cleanup_sysroot_previous_build(library_dir: &Path) { &mut |_| Ok(()), false, ); - - let _ = fs::remove_file(library_dir.join("Cargo.lock")); } pub fn build_sysroot(env: &HashMap<String, String>, config: &ConfigInfo) -> Result<(), String> { diff --git a/example/mini_core_hello_world.rs b/example/mini_core_hello_world.rs index 6b6f71edaf8..092fd6a7640 100644 --- a/example/mini_core_hello_world.rs +++ b/example/mini_core_hello_world.rs @@ -6,7 +6,7 @@ )] #![no_core] #![allow(dead_code, internal_features, non_camel_case_types)] -#![rustfmt::skip] +#![cfg_attr(rustfmt, rustfmt_skip)] extern crate mini_core; @@ -198,10 +198,17 @@ 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); - 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>() }; + assert!(!u8_needs_drop); + let slice_needs_drop = const { intrinsics::needs_drop::<[u8]>() }; + assert!(!slice_needs_drop); + let noisy_drop = const { intrinsics::needs_drop::<NoisyDrop>() }; + assert!(noisy_drop); + let noisy_unsized_drop = const { intrinsics::needs_drop::<NoisyDropUnsized>() }; + assert!(noisy_unsized_drop); + */ Unique { pointer: 0 as *const &str, |