Skip to content

Commit 5837f85

Browse files
committed
Auto merge of #150628 - JonathanBrouwer:rollup-zy040xr, r=JonathanBrouwer
Rollup of 4 pull requests Successful merges: - rust-lang/rust#149991 (Add checks for gpu-kernel calling conv) - rust-lang/rust#150047 (std: merge `sys::pal::common` and `sys_common` into `sys::helpers`) - rust-lang/rust#150441 (do not suggest method call removal if it changes receiver type) - rust-lang/rust#150616 (Update `browser-ui-test` version to `0.23.0`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e9b24f0 + 13e6759 commit 5837f85

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/fail/shims/fs/isolated_file.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ LL | let fd = cvt_r(|| unsafe { open64(path.as_ptr(), flags, opts.mode a
1515
at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC
1616
3: std::sys::fs::PLATFORM::File::open::{closure#0}
1717
at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC
18-
4: std::sys::pal::PLATFORM::small_c_string::run_with_cstr_stack
19-
at RUSTLIB/std/src/sys/pal/PLATFORM/small_c_string.rs:LL:CC
20-
5: std::sys::pal::PLATFORM::small_c_string::run_with_cstr
21-
at RUSTLIB/std/src/sys/pal/PLATFORM/small_c_string.rs:LL:CC
22-
6: std::sys::pal::PLATFORM::small_c_string::run_path_with_cstr
23-
at RUSTLIB/std/src/sys/pal/PLATFORM/small_c_string.rs:LL:CC
18+
4: std::sys::helpers::small_c_string::run_with_cstr_stack
19+
at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC
20+
5: std::sys::helpers::small_c_string::run_with_cstr
21+
at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC
22+
6: std::sys::helpers::small_c_string::run_path_with_cstr
23+
at RUSTLIB/std/src/sys/helpers/small_c_string.rs:LL:CC
2424
7: std::sys::fs::PLATFORM::File::open
2525
at RUSTLIB/std/src/sys/fs/PLATFORM.rs:LL:CC
2626
8: std::fs::OpenOptions::_open

0 commit comments

Comments
 (0)