Skip to content

Commit ebee724

Browse files
committed
Auto merge of rust-lang#138830 - matthiaskrgr:rollup-gaxgfwl, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#138410 (Couple mir building cleanups) - rust-lang#138490 (Forward `stream_position` in `Arc<File>` as well) - rust-lang#138535 (Cleanup `LangString::parse`) - rust-lang#138536 (stable_mir: Add `MutMirVisitor`) - rust-lang#138673 (Fix build failure on Trusty) - rust-lang#138750 (Make `crate_hash` not iterate over `hir_crate` owners anymore) - rust-lang#138763 (jsondocck: Replace `jsonpath_lib` with `jsonpath-rust`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 2e8b632 + 1c0db45 commit ebee724

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

std/src/fs.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,9 @@ impl Seek for Arc<File> {
13431343
fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
13441344
(&**self).seek(pos)
13451345
}
1346+
fn stream_position(&mut self) -> io::Result<u64> {
1347+
(&**self).stream_position()
1348+
}
13461349
}
13471350

13481351
impl OpenOptions {

std/src/sys/random/trusty.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extern "C" {
1+
unsafe extern "C" {
22
fn trusty_rng_secure_rand(randomBuffer: *mut core::ffi::c_void, randomBufferLen: libc::size_t);
33
}
44

0 commit comments

Comments
 (0)