about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKirill Bulatov <mail4score@gmail.com>2021-05-03 18:44:58 +0300
committerKirill Bulatov <mail4score@gmail.com>2021-05-03 18:45:30 +0300
commit53a73de3d10e20a13153c94e050a8ad9230169eb (patch)
treec81670ec01d16b50c623904ef8a0275a33f3f220
parent8089a227f4b40872cf8491cfb9e065a8b05705a2 (diff)
downloadrust-53a73de3d10e20a13153c94e050a8ad9230169eb.tar.gz
rust-53a73de3d10e20a13153c94e050a8ad9230169eb.zip
Small fixes
-rw-r--r--crates/ide/src/ssr.rs2
-rw-r--r--crates/ide_assists/src/lib.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/crates/ide/src/ssr.rs b/crates/ide/src/ssr.rs
index 97ad66d3589..57ec8026140 100644
--- a/crates/ide/src/ssr.rs
+++ b/crates/ide/src/ssr.rs
@@ -13,7 +13,7 @@ pub(crate) fn ssr_assists(
     let mut ssr_assists = Vec::with_capacity(2);
 
     let (match_finder, comment_range) = match ide_ssr::ssr_from_comment(db, frange) {
-        Some((match_finder, comment_range)) => (match_finder, comment_range),
+        Some(ssr_data) => ssr_data,
         None => return ssr_assists,
     };
     let id = AssistId("ssr", AssistKind::RefactorRewrite);
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 5a0047f0373..723531078f1 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -28,7 +28,7 @@ pub(crate) use crate::assist_context::{AssistContext, Assists};
 
 pub use assist_config::AssistConfig;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum AssistKind {
     // FIXME: does the None variant make sense? Probably not.
     None,
@@ -91,7 +91,7 @@ impl FromStr for AssistKind {
 
 /// Unique identifier of the assist, should not be shown to the user
 /// directly.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct AssistId(pub &'static str, pub AssistKind);
 
 /// A way to control how many asssist to resolve during the assist resolution.