Merge #10248

10248: internal: remove dead code r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2024-11-25 16:24:46 +00:00 · 2021-09-15 18:23:46 +00:00 · 2021-09-15 18:23:46 +00:00 · c577e128fc
commit c577e128fc
parent 911659a166 73b0f9dc04
10 changed files with 10 additions and 43 deletions
--- a/crates/flycheck/src/lib.rs
+++ b/crates/flycheck/src/lib.rs
@ -55,7 +55,7 @@ impl fmt::Display for FlycheckConfig {
 pub struct FlycheckHandle {
    // XXX: drop order is significant
    sender: Sender<Restart>,
-    thread: jod_thread::JoinHandle,
+    _thread: jod_thread::JoinHandle,
 }

 impl FlycheckHandle {
@ -71,7 +71,7 @@ impl FlycheckHandle {
            .name("Flycheck".to_owned())
            .spawn(move || actor.run(receiver))
            .expect("failed to spawn thread");
-        FlycheckHandle { sender, thread }
+        FlycheckHandle { sender, _thread: thread }
    }

    /// Schedule a re-start of the cargo check worker.
--- a/crates/hir/src/source_analyzer.rs
+++ b/crates/hir/src/source_analyzer.rs
@ -43,7 +43,6 @@ pub(crate) struct SourceAnalyzer {
    body: Option<Arc<Body>>,
    body_source_map: Option<Arc<BodySourceMap>>,
    infer: Option<Arc<InferenceResult>>,
-    scopes: Option<Arc<ExprScopes>>,
 }

 impl SourceAnalyzer {
@ -65,7 +64,6 @@ impl SourceAnalyzer {
            body: Some(body),
            body_source_map: Some(source_map),
            infer: Some(db.infer(def)),
-            scopes: Some(scopes),
            file_id: node.file_id,
        }
    }
@ -79,7 +77,6 @@ impl SourceAnalyzer {
            body: None,
            body_source_map: None,
            infer: None,
-            scopes: None,
            file_id: node.file_id,
        }
    }
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide_completion/src/context.rs
@ -107,7 +107,6 @@ pub(crate) struct CompletionContext<'a> {

    pub(super) pattern_ctx: Option<PatternContext>,
    pub(super) path_context: Option<PathCompletionContext>,
-    pub(super) active_parameter: Option<ActiveParameter>,
    pub(super) locals: Vec<(String, Local)>,

    pub(super) incomplete_let: bool,
@ -170,7 +169,6 @@ impl<'a> CompletionContext<'a> {
            attribute_under_caret: None,
            previous_token: None,
            path_context: None,
-            active_parameter: ActiveParameter::at(db, position),
            locals,
            incomplete_let: false,
            no_completion_required: false,
--- a/crates/ide_completion/src/render/enum_variant.rs
+++ b/crates/ide_completion/src/render/enum_variant.rs
@ -26,7 +26,6 @@ pub(crate) fn render_variant(
 #[derive(Debug)]
 struct EnumRender<'a> {
    ctx: RenderContext<'a>,
-    name: hir::Name,
    variant: hir::Variant,
    path: Option<hir::ModPath>,
    qualified_name: hir::ModPath,
@ -58,7 +57,7 @@ impl<'a> EnumRender<'a> {
            ),
        };

-        EnumRender { ctx, name, variant, path, qualified_name, short_qualified_name, variant_kind }
+        EnumRender { ctx, variant, path, qualified_name, short_qualified_name, variant_kind }
    }
    fn render(self, import_to_add: Option<ImportEdit>) -> CompletionItem {
        let mut item = CompletionItem::new(
--- a/crates/ide_db/src/call_info.rs
+++ b/crates/ide_db/src/call_info.rs
@ -154,15 +154,6 @@ pub struct ActiveParameter {
 }

 impl ActiveParameter {
-    pub fn at(db: &RootDatabase, position: FilePosition) -> Option<Self> {
-        let sema = Semantics::new(db);
-        let file = sema.parse(position.file_id);
-        let file = file.syntax();
-        let token = file.token_at_offset(position.offset).next()?;
-        let token = sema.descend_into_macros(token);
-        Self::at_token(&sema, token)
-    }
-
    pub fn at_token(sema: &Semantics<RootDatabase>, token: SyntaxToken) -> Option<Self> {
        let (signature, active_parameter) = call_info_impl(sema, token)?;

--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@ -103,7 +103,6 @@ pub struct SsrRule {

 #[derive(Debug)]
 pub struct SsrPattern {
-    raw: parsing::RawPattern,
    parsed_rules: Vec<parsing::ParsedRule>,
 }

--- a/crates/ide_ssr/src/matching.rs
+++ b/crates/ide_ssr/src/matching.rs
@ -61,9 +61,6 @@ pub struct Match {
 /// Information about a placeholder bound in a match.
 #[derive(Debug)]
 pub(crate) struct PlaceholderMatch {
-    /// The node that the placeholder matched to. If set, then we'll search for further matches
-    /// within this node. It isn't set when we match tokens within a macro call's token tree.
-    pub(crate) node: Option<SyntaxNode>,
    pub(crate) range: FileRange,
    /// More matches, found within `node`.
    pub(crate) inner_matches: SsrMatches,
@ -186,7 +183,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> {
                self.validate_range(&original_range)?;
                matches_out.placeholder_values.insert(
                    placeholder.ident.clone(),
-                    PlaceholderMatch::new(Some(code), original_range),
+                    PlaceholderMatch::from_range(original_range),
                );
            }
            return Ok(());
@ -715,19 +712,14 @@ fn recording_match_fail_reasons() -> bool {
 }

 impl PlaceholderMatch {
-    fn new(node: Option<&SyntaxNode>, range: FileRange) -> Self {
+    fn from_range(range: FileRange) -> Self {
        Self {
-            node: node.cloned(),
            range,
            inner_matches: SsrMatches::default(),
            autoderef_count: 0,
            autoref_kind: ast::SelfParamKind::Owned,
        }
    }
-
-    fn from_range(range: FileRange) -> Self {
-        Self::new(None, range)
-    }
 }

 impl NodeKind {
@ -788,7 +780,6 @@ impl PatternIterator {

 #[cfg(test)]
 mod tests {
-    use super::*;
    use crate::{MatchFinder, SsrRule};

    #[test]
@ -803,14 +794,6 @@ mod tests {
        assert_eq!(matches.matches.len(), 1);
        assert_eq!(matches.matches[0].matched_node.text(), "foo(1+2)");
        assert_eq!(matches.matches[0].placeholder_values.len(), 1);
-        assert_eq!(
-            matches.matches[0].placeholder_values[&Var("x".to_string())]
-                .node
-                .as_ref()
-                .unwrap()
-                .text(),
-            "1+2"
-        );

        let edits = match_finder.edits();
        assert_eq!(edits.len(), 1);
--- a/crates/ide_ssr/src/parsing.rs
+++ b/crates/ide_ssr/src/parsing.rs
@ -204,7 +204,7 @@ impl FromStr for SsrPattern {
    fn from_str(pattern_str: &str) -> Result<SsrPattern, SsrError> {
        let raw_pattern = pattern_str.parse()?;
        let parsed_rules = ParsedRule::new(&raw_pattern, None)?;
-        Ok(SsrPattern { raw: raw_pattern, parsed_rules })
+        Ok(SsrPattern { parsed_rules })
    }
 }

--- a/crates/proc_macro_api/src/process.rs
+++ b/crates/proc_macro_api/src/process.rs
@ -16,7 +16,7 @@ use crate::{

 #[derive(Debug)]
 pub(crate) struct ProcMacroProcessSrv {
-    process: Process,
+    _process: Process,
    stdin: ChildStdin,
    stdout: BufReader<ChildStdout>,
 }
@ -29,7 +29,7 @@ impl ProcMacroProcessSrv {
        let mut process = Process::run(process_path, args)?;
        let (stdin, stdout) = process.stdio().expect("couldn't access child stdio");

-        let srv = ProcMacroProcessSrv { process, stdin, stdout };
+        let srv = ProcMacroProcessSrv { _process: process, stdin, stdout };

        Ok(srv)
    }
--- a/crates/vfs-notify/src/lib.rs
+++ b/crates/vfs-notify/src/lib.rs
@ -18,7 +18,7 @@ use walkdir::WalkDir;
 pub struct NotifyHandle {
    // Relative order of fields below is significant.
    sender: Sender<Message>,
-    thread: jod_thread::JoinHandle,
+    _thread: jod_thread::JoinHandle,
 }

 #[derive(Debug)]
@ -35,7 +35,7 @@ impl loader::Handle for NotifyHandle {
            .name("VfsLoader".to_owned())
            .spawn(move || actor.run(receiver))
            .expect("failed to spawn thread");
-        NotifyHandle { sender, thread }
+        NotifyHandle { sender, _thread: thread }
    }
    fn set_config(&mut self, config: loader::Config) {
        self.sender.send(Message::Config(config)).unwrap()