Introduce max_suggestion_distance function to avoid duplicating the heuristic

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 5cdce22d82644cffa614a5375c2776a672a97d5b..b5a8d5a13fe0e7a31fa33af74b4e2da6f65e210a 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -72,7 +72,7 @@
 use syntax::parse::token::{self, special_names, special_idents};
 use syntax::ptr::P;
 use syntax::codemap::{self, Span, Pos};
-use syntax::util::lev_distance::lev_distance;
+use syntax::util::lev_distance::{lev_distance, max_suggestion_distance};
 
 use rustc_front::intravisit::{self, FnKind, Visitor};
 use rustc_front::hir;
@@ -3384,11 +3384,7 @@ fn find_best_match_for_name(&mut self, name: &str) -> SuggestionType {
             }
         }
 
-        // As a loose rule to avoid obviously incorrect suggestions, clamp the
-        // maximum edit distance we will accept for a suggestion to one third of
-        // the typo'd name's length.
-        let max_distance = std::cmp::max(name.len(), 3) / 3;
-
+        let max_distance = max_suggestion_distance(name);
         if !values.is_empty() && values[smallest] <= max_distance && name != &maybes[smallest][..] {
 
             SuggestionType::Function(maybes[smallest].to_string())

diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 09c98c3e54727eddf2f9524732bfd8f3e05762d8..cf6881ab65051449ed8958aebf71879bb25ab710 100644 (file)
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -24,7 +24,7 @@
 use parse::token::{InternedString, intern, str_to_ident};
 use ptr::P;
 use util::small_vector::SmallVector;
-use util::lev_distance::lev_distance;
+use util::lev_distance::{lev_distance, max_suggestion_distance};
 use ext::mtwt;
 use fold::Folder;
 
@@ -779,10 +779,8 @@ pub fn name_of(&self, st: &str) -> ast::Name {
     }
 
     pub fn suggest_macro_name(&mut self, name: &str, span: Span) {
-        use std::cmp::max;
-
         let mut min: Option<(Name, usize)> = None;
-        let max_dist = max(name.len() / 3, 1);
+        let max_dist = max_suggestion_distance(name);
         for macro_name in self.syntax_env.names.iter() {
             let dist = lev_distance(name, &macro_name.as_str());
             if dist <= max_dist && (min.is_none() || min.unwrap().1 > dist) {

diff --git a/src/libsyntax/util/lev_distance.rs b/src/libsyntax/util/lev_distance.rs
index 28f8510ce3fee150100523f49c455f82e2c6e7c3..9bf96311122e0e3c51a891ec349afedc2012cbfe 100644 (file)
--- a/src/libsyntax/util/lev_distance.rs
+++ b/src/libsyntax/util/lev_distance.rs
@@ -41,6 +41,14 @@ pub fn lev_distance(me: &str, t: &str) -> usize {
     dcol[t_last + 1]
 }
 
+pub fn max_suggestion_distance(name: &str) -> usize {
+    use std::cmp::max;
+    // As a loose rule to avoid obviously incorrect suggestions, clamp the
+    // maximum edit distance we will accept for a suggestion to one third of
+    // the typo'd name's length.
+    max(name.len(), 3) / 3
+}
+
 #[test]
 fn test_lev_distance() {
     use std::char::{ from_u32, MAX };