From bf440bc2cdf494a3710d3d4a00a016a49ddf0567 Mon Sep 17 00:00:00 2001
From: The Miri Cronjob Bot <miri@cron.bot>
Date: Sun, 19 Jan 2025 05:07:59 +0000
Subject: [PATCH 1/2] Preparing for merge from rustc

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index 75710dece6..fa5dbb99e8 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-dd333ca66f20edafdda2d9f405ffa1acdc958821
+01706e1a34c87656fcbfce198608f4cd2ac6461a

From 6bb9822adb82831a9a9aa35c937432c08b206d5a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 19 Jan 2025 09:54:29 -0700
Subject: [PATCH 2/2] fix location of pipe module

---
 tests/pass/shims/pipe.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/pass/shims/pipe.rs b/tests/pass/shims/pipe.rs
index d547b2b1cc..1be29886d2 100644
--- a/tests/pass/shims/pipe.rs
+++ b/tests/pass/shims/pipe.rs
@@ -1,10 +1,11 @@
 //@ignore-target: windows
 
 #![feature(anonymous_pipe)]
-use std::io::{Read, Write};
+
+use std::io::{Read, Write, pipe};
 
 fn main() {
-    let (mut ping_rx, mut ping_tx) = std::pipe::pipe().unwrap();
+    let (mut ping_rx, mut ping_tx) = pipe().unwrap();
     ping_tx.write(b"hello").unwrap();
     let mut buf: [u8; 5] = [0; 5];
     ping_rx.read(&mut buf).unwrap();