Auto merge of #578 - Mark-Simulacrum:no-locked, r=pietroalbini

bors · bors · commit aa40b144e61f · 2021-05-22T19:52:54.000Z
Update rustwide to 0.13.1 This includes rust-lang/rustwide#61 which addresses breakage in the beta crater run.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,7 +60,7 @@ hmac = "0.7"
 sha-1 = "0.8"
 rust_team_data = { git = "https://github.com/rust-lang/team" }
 systemstat = "0.1.4"
-rustwide = { version = "0.13.0", features = ["unstable", "unstable-toolchain-ci"] }
+rustwide = { version = "0.13.1", features = ["unstable", "unstable-toolchain-ci"] }
 percent-encoding = "2.1.0"
 remove_dir_all = "0.5.2"
 ctrlc = "3.1.3"
diff --git a/src/prelude.rs b/src/prelude.rs
@@ -9,6 +9,7 @@ pub trait FailExt {
 }
 
 impl FailExt for dyn Fail {
+    #[allow(clippy::manual_map)]
     fn downcast_ctx<T: Fail>(&self) -> Option<&T> {
         if let Some(res) = self.downcast_ref::<T>() {
             Some(res)
diff --git a/src/runner/unstable_features.rs b/src/runner/unstable_features.rs
@@ -77,6 +77,7 @@ fn eat_token<'a>(s: Option<&'a str>, tok: &str) -> Option<&'a str> {
 
 fn eat_whitespace(s: Option<&str>) -> Option<&str> {
     s.and_then(|s| {
+        #[allow(clippy::manual_map)]
         if let Some(i) = s.find(|c: char| !c.is_whitespace()) {
             Some(&s[i..])
         } else {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ pub trait FailExt {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`impl FailExt for dyn Fail {`
	`12`	`+ #[allow(clippy::manual_map)]`
`12`	`13`	`fn downcast_ctx<T: Fail>(&self) -> Option<&T> {`
`13`	`14`	`if let Some(res) = self.downcast_ref::<T>() {`
`14`	`15`	`Some(res)`