diff options
| author | Zalathar <Zalathar@users.noreply.github.com> | 2025-08-15 20:13:42 +1000 |
|---|---|---|
| committer | Zalathar <Zalathar@users.noreply.github.com> | 2025-08-15 20:24:13 +1000 |
| commit | 9e7d06692803af171633b90799495be880dc3508 (patch) | |
| tree | 05b8bffe2b6d01a3ddac5c81b8cf5430537a4691 /compiler/rustc_codegen_llvm/src | |
| parent | 61932e12221fb8a76a8dedc4a21e5f6e1e332d9d (diff) | |
| download | rust-9e7d06692803af171633b90799495be880dc3508.tar.gz rust-9e7d06692803af171633b90799495be880dc3508.zip | |
Simplify the `args_cstr_buff` assertion
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/owned_target_machine.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/owned_target_machine.rs b/compiler/rustc_codegen_llvm/src/back/owned_target_machine.rs index b073bafc0aa..6d8178320fe 100644 --- a/compiler/rustc_codegen_llvm/src/back/owned_target_machine.rs +++ b/compiler/rustc_codegen_llvm/src/back/owned_target_machine.rs @@ -1,3 +1,4 @@ +use std::assert_matches::assert_matches; use std::ffi::CStr; use std::marker::PhantomData; use std::ptr::NonNull; @@ -41,11 +42,9 @@ impl OwnedTargetMachine { args_cstr_buff: &[u8], use_wasm_eh: bool, ) -> Result<Self, LlvmError<'static>> { - assert!(args_cstr_buff.len() > 0); - assert!( - *args_cstr_buff.last().unwrap() == 0, - "The last character must be a null terminator." - ); + // The argument list is passed as the concatenation of one or more C strings. + // This implies that there must be a last byte, and it must be 0. + assert_matches!(args_cstr_buff, [.., b'\0'], "the last byte must be a NUL terminator"); // SAFETY: llvm::LLVMRustCreateTargetMachine copies pointed to data let tm_ptr = unsafe { |
