Use C string literals not cstr!
Since Rust 1.77.0 the language has supported C string literals, so the
`cstr!` macro is no longer needed. Replace existing usages with the
equivalent literal.
See https://doc.rust-lang.org/reference/tokens.html#c-string-literals.
I believe that the two are equivalent:
- Escapes are handled the same way;
- Both allow arbitrary Unicode, which is mapped to UTF-8 (I don't
think we made any use of this);
- Both treat any embedded NUL character as a compile time error.
This is of no significance whatsoever, but it does make the code a
tiny bit simpler. It should not change the compiled code at all, so
no flagging should be needed.
I'm not deleting the macro in this CL; I'll do a follow-up for that,
since there may be usages I can't see, and it has greater chance of
accidental conflict.
Test: TH
Change-Id: I4354b3b0a0c53fbec0c2d78b4182786e4e2d0ce8
diff --git a/tests/testapk/src/native/testbinary.rs b/tests/testapk/src/native/testbinary.rs
index 2502113..a84b955 100644
--- a/tests/testapk/src/native/testbinary.rs
+++ b/tests/testapk/src/native/testbinary.rs
@@ -24,7 +24,6 @@
},
binder::{BinderFeatures, ExceptionCode, Interface, Result as BinderResult, Status, Strong},
};
-use cstr::cstr;
use log::{error, info};
use std::process::exit;
use std::string::String;
@@ -130,7 +129,7 @@
}
fn unimplemented<T>() -> BinderResult<T> {
- let message = cstr!("Got a call to an unimplemented ITestService method in testbinary.rs");
+ let message = c"Got a call to an unimplemented ITestService method in testbinary.rs";
error!("{message:?}");
Err(Status::new_exception(ExceptionCode::UNSUPPORTED_OPERATION, Some(message)))
}