Merge #7818

7818: Clean up warnings r=matklad a=bugadani



Co-authored-by: Dániel Buga <bugadani@gmail.com>

Author: bors[bot]

crates/mbe/src/benchmark.rs

@@ -177,7 +177,7 @@ fn invocation_fixtures(rules: &FxHashMap<String, MacroRules>) -> Vec<(String, tt
             let c = 1013904223;
             *seed = usize::wrapping_add(usize::wrapping_mul(*seed, a), c);
             return *seed;
-        };
+        }
         fn make_ident(ident: &str) -> tt::TokenTree {
             tt::Leaf::Ident(tt::Ident { id: tt::TokenId::unspecified(), text: SmolStr::new(ident) })
                 .into()

crates/rust-analyzer/tests/rust-analyzer/main.rs

@@ -54,7 +54,6 @@ version = "0.0.0"
 use std::collections::Spam;
 "#,
     )
-    .with_sysroot(true)
     .server()
     .wait_until_workspace_is_loaded();
 
@@ -451,7 +450,6 @@ fn main() {{}}
 "#,
         librs, libs
     ))
-    .with_sysroot(true)
     .server()
     .wait_until_workspace_is_loaded();
 

crates/rust-analyzer/tests/rust-analyzer/support.rs

@@ -20,21 +20,14 @@ use crate::testdir::TestDir;
 
 pub(crate) struct Project<'a> {
     fixture: &'a str,
-    with_sysroot: bool,
     tmp_dir: Option<TestDir>,
     roots: Vec<PathBuf>,
     config: serde_json::Value,
 }
 
 impl<'a> Project<'a> {
     pub(crate) fn with_fixture(fixture: &str) -> Project {
-        Project {
-            fixture,
-            tmp_dir: None,
-            roots: vec![],
-            with_sysroot: false,
-            config: serde_json::Value::Null,
-        }
+        Project { fixture, tmp_dir: None, roots: vec![], config: serde_json::Value::Null }
     }
 
     pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> {
@@ -47,11 +40,6 @@ impl<'a> Project<'a> {
         self
     }
 
-    pub(crate) fn with_sysroot(mut self, yes: bool) -> Project<'a> {
-        self.with_sysroot = yes;
-        self
-    }
-
     pub(crate) fn with_config(mut self, config: serde_json::Value) -> Project<'a> {
         self.config = config;
         self