Auto merge of #1964 - RalfJung:rustup, r=RalfJung

bors · bors · commit 36378cf60d56 · 2022-01-26T16:00:00.000Z
rustup

Let's hope we can finally get CI green again...
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-e19ca1d946269f7b7eb13171531caf2e16f42076
+a7f375789bab1a4e4a291c963081a8ca7d2b6bd7
diff --git a/src/shims/posix/macos/dlsym.rs b/src/shims/posix/macos/dlsym.rs
@@ -17,6 +17,7 @@ impl Dlsym {
     pub fn from_str(name: &str) -> InterpResult<'static, Option<Dlsym>> {
         Ok(match name {
             "getentropy" => Some(Dlsym::getentropy),
+            "openat" => None, // std has a fallback for this
             _ => throw_unsup_format!("unsupported macOS dlsym: {}", name),
         })
     }

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ impl Dlsym {`
`17`	`17`	`pub fn from_str(name: &str) -> InterpResult<'static, Option<Dlsym>> {`
`18`	`18`	`Ok(match name {`
`19`	`19`	`"getentropy" => Some(Dlsym::getentropy),`
	`20`	`+ "openat" => None, // std has a fallback for this`
`20`	`21`	`_ => throw_unsup_format!("unsupported macOS dlsym: {}", name),`
`21`	`22`	`})`
`22`	`23`	`}`