Skip to content

Commit 2989eb7

Browse files
committed
Auto merge of #153344 - JonathanBrouwer:rollup-uL4XlqI, r=JonathanBrouwer
Rollup of 6 pull requests Successful merges: - rust-lang/rust#153336 (stdarch subtree update) - rust-lang/rust#152943 (Parse `impl` restrictions) - rust-lang/rust#153184 (Replace CodegenResults with CompiledModules) - rust-lang/rust#153285 (Update call-llvm-intrinsics test for Rust 1.94.0 IR) - rust-lang/rust#153319 (Comments and docs: add missing periods to "ie.") - rust-lang/rust#153326 (Make `rustc_with_all_queries!` pass query modifiers as named values)
2 parents 3afa2f2 + ea1f8cc commit 2989eb7

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tests/fail/shims/shim_arg_size.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
extern "C" {
3-
// Use the wrong type (ie. not `i32`) for the `c` argument.
3+
// Use the wrong type (i.e. not `i32`) for the `c` argument.
44
fn memchr(s: *const std::ffi::c_void, c: u8, n: usize) -> *mut std::ffi::c_void;
55
}
66

0 commit comments

Comments
 (0)