diff options
| author | bors <bors@rust-lang.org> | 2025-03-22 14:03:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-03-22 14:03:50 +0000 |
| commit | d93f678fa55842cccd2f091deccd93e9494b3764 (patch) | |
| tree | e8fa4484e06f272b5216c99787e79e9dda5ce0f8 /library/std | |
| parent | 0ce1369bde8ea61c0286f6e3e35e38fca569a50b (diff) | |
| parent | a4c0173d122a9272b4184b995b82fdbc96dcabab (diff) | |
Auto merge of #138830 - matthiaskrgr:rollup-gaxgfwl, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #138410 (Couple mir building cleanups) - #138490 (Forward `stream_position` in `Arc<File>` as well) - #138535 (Cleanup `LangString::parse`) - #138536 (stable_mir: Add `MutMirVisitor`) - #138673 (Fix build failure on Trusty) - #138750 (Make `crate_hash` not iterate over `hir_crate` owners anymore) - #138763 (jsondocck: Replace `jsonpath_lib` with `jsonpath-rust`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std')
| -rw-r--r-- | library/std/src/fs.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/random/trusty.rs | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs index f9a360585e8..7fc010d2ec3 100644 --- a/library/std/src/fs.rs +++ b/library/std/src/fs.rs @@ -1343,6 +1343,9 @@ impl Seek for Arc<File> { fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> { (&**self).seek(pos) } + fn stream_position(&mut self) -> io::Result<u64> { + (&**self).stream_position() + } } impl OpenOptions { diff --git a/library/std/src/sys/random/trusty.rs b/library/std/src/sys/random/trusty.rs index da6ca3eea24..e4db24695f8 100644 --- a/library/std/src/sys/random/trusty.rs +++ b/library/std/src/sys/random/trusty.rs @@ -1,4 +1,4 @@ -extern "C" { +unsafe extern "C" { fn trusty_rng_secure_rand(randomBuffer: *mut core::ffi::c_void, randomBufferLen: libc::size_t); } |
