fix render::tests::score_fn_type_and_name_match

Author: davidbarsky

crates/ide-completion/src/render.rs

@@ -2042,8 +2042,8 @@ fn f() { A { bar: b$0 }; }
             expect![[r#"
                 fn bar() fn() -> u8 [type+name]
                 fn baz() fn() -> u8 [type]
-                ex bar()  [type]
                 ex baz()  [type]
+                ex bar()  [type]
                 st A A []
                 fn f() fn() []
             "#]],

crates/ide-db/src/test_data/test_symbol_index_collection.txt

@@ -1013,7 +1013,7 @@
                     Struct(
                         Struct {
                             id: StructId(
-                                4,
+                                5c04,
                             ),
                         },
                     ),

crates/mbe/src/tests.rs

@@ -109,8 +109,8 @@ fn unbalanced_brace() {
 "#,
         r#""#,
         expect![[r#"
-            SUBTREE $$ 1:[email protected]#2 1:[email protected]#2
-              SUBTREE {} 0:[email protected]#2 0:[email protected]#2
+            SUBTREE $$ 1:[email protected]#4294967037 1:[email protected]#4294967037
+              SUBTREE {} 0:[email protected]#4294967037 0:[email protected]#4294967037
 
             {}"#]],
     );

docs/book/src/configuration_generated.md

@@ -375,10 +375,10 @@ Note that the trait themselves can still be completed.
 Default:
 
 ```{
-  "Ok": {
-    "postfix": "ok",
-    "body": "Ok(${receiver})",
-    "description": "Wrap the expression in a `Result::Ok`",
+  "Some": {
+    "postfix": "some",
+    "body": "Some(${receiver})",
+    "description": "Wrap the expression in an `Option::Some`",
     "scope": "expr"
   },
   "Box::pin": {
@@ -395,16 +395,10 @@ Default:
     "description": "Put the expression into an `Arc`",
     "scope": "expr"
   },
-  "Some": {
-    "postfix": "some",
-    "body": "Some(${receiver})",
-    "description": "Wrap the expression in an `Option::Some`",
-    "scope": "expr"
-  },
-  "Err": {
-    "postfix": "err",
-    "body": "Err(${receiver})",
-    "description": "Wrap the expression in a `Result::Err`",
+  "Ok": {
+    "postfix": "ok",
+    "body": "Ok(${receiver})",
+    "description": "Wrap the expression in a `Result::Ok`",
     "scope": "expr"
   },
   "Rc::new": {
@@ -413,6 +407,12 @@ Default:
     "requires": "std::rc::Rc",
     "description": "Put the expression into an `Rc`",
     "scope": "expr"
+  },
+  "Err": {
+    "postfix": "err",
+    "body": "Err(${receiver})",
+    "description": "Wrap the expression in a `Result::Err`",
+    "scope": "expr"
   }
 }
 

editors/code/package.json

@@ -1332,10 +1332,10 @@
                     "rust-analyzer.completion.snippets.custom": {
                         "markdownDescription": "Custom completion snippets.",
                         "default": {
-                            "Ok": {
-                                "postfix": "ok",
-                                "body": "Ok(${receiver})",
-                                "description": "Wrap the expression in a `Result::Ok`",
+                            "Some": {
+                                "postfix": "some",
+                                "body": "Some(${receiver})",
+                                "description": "Wrap the expression in an `Option::Some`",
                                 "scope": "expr"
                             },
                             "Box::pin": {
@@ -1352,16 +1352,10 @@
                                 "description": "Put the expression into an `Arc`",
                                 "scope": "expr"
                             },
-                            "Some": {
-                                "postfix": "some",
-                                "body": "Some(${receiver})",
-                                "description": "Wrap the expression in an `Option::Some`",
-                                "scope": "expr"
-                            },
-                            "Err": {
-                                "postfix": "err",
-                                "body": "Err(${receiver})",
-                                "description": "Wrap the expression in a `Result::Err`",
+                            "Ok": {
+                                "postfix": "ok",
+                                "body": "Ok(${receiver})",
+                                "description": "Wrap the expression in a `Result::Ok`",
                                 "scope": "expr"
                             },
                             "Rc::new": {
@@ -1370,6 +1364,12 @@
                                 "requires": "std::rc::Rc",
                                 "description": "Put the expression into an `Rc`",
                                 "scope": "expr"
+                            },
+                            "Err": {
+                                "postfix": "err",
+                                "body": "Err(${receiver})",
+                                "description": "Wrap the expression in a `Result::Err`",
+                                "scope": "expr"
                             }
                         },
                         "type": "object"