1 files changed, 13 insertions, 12 deletions

diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index e46f309ae..20fb783b8 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -4,7 +4,6 @@ use std::path::{PathBuf, Path};
 use std::fs;
 
 use salsa::Database;
-use rustc_hash::FxHashMap;
 
 use ra_db::SyntaxDatabase;
 use ra_syntax::ast::{self, AstNode};
@@ -35,7 +34,7 @@ fn test(a: u32, b: isize, c: !, d: &str) {
     "test";
     1.0f32;
 }"#,
-        "0001_basics.txt",
+        "basics.txt",
     );
 }
 
@@ -49,7 +48,7 @@ fn test() {
     let c = b;
 }
 }"#,
-        "0002_let.txt",
+        "let.txt",
     );
 }
 
@@ -68,7 +67,7 @@ fn test() {
     b::c();
 }
 }"#,
-        "0003_paths.txt",
+        "paths.txt",
     );
 }
 
@@ -91,7 +90,7 @@ fn test() {
     a.c;
 }
 "#,
-        "0004_struct.txt",
+        "struct.txt",
     );
 }
 
@@ -113,7 +112,7 @@ fn test(a: &u32, b: &mut u32, c: *const u32, d: *mut u32) {
     *d;
 }
 "#,
-        "0005_refs.txt",
+        "refs_and_ptrs.txt",
     );
 }
 
@@ -134,7 +133,7 @@ fn test() -> &mut &f64 {
     &mut &c
 }
 "#,
-        "0006_backwards.txt",
+        "backwards.txt",
     );
 }
 
@@ -153,7 +152,7 @@ impl S {
     }
 }
 "#,
-        "0007_self.txt",
+        "self.txt",
     );
 }
 
@@ -177,7 +176,7 @@ fn test() {
     10 < 3
 }
 "#,
-        "0008_boolean_op.txt",
+        "boolean_op.txt",
     );
 }
 
@@ -195,14 +194,14 @@ fn infer(content: &str) -> String {
             .unwrap();
         let inference_result = func.infer(&db).unwrap();
         let body_syntax_mapping = func.body_syntax_mapping(&db).unwrap();
-        let mut types = FxHashMap::default();
+        let mut types = Vec::new();
         for (pat, ty) in &inference_result.type_of_pat {
             let syntax_ptr = if let Some(sp) = body_syntax_mapping.pat_syntax(*pat) {
                 sp
             } else {
                 continue;
             };
-            types.insert(syntax_ptr, ty);
+            types.push((syntax_ptr, ty));
         }
         for (expr, ty) in &inference_result.type_of_expr {
             let syntax_ptr = if let Some(sp) = body_syntax_mapping.expr_syntax(*expr) {
@@ -210,8 +209,10 @@ fn infer(content: &str) -> String {
             } else {
                 continue;
             };
-            types.insert(syntax_ptr, ty);
+            types.push((syntax_ptr, ty));
         }
+        // sort ranges for consistency
+        types.sort_by_key(|(ptr, _)| (ptr.range().start(), ptr.range().end()));
         for (syntax_ptr, ty) in &types {
             let node = syntax_ptr.resolve(&source_file);
             write!(