Flip Assist::new arguments

Author: matklad

crates/ra_assists/src/assist_ctx.rs

@@ -100,7 +100,7 @@ impl<'a> AssistCtx<'a> {
         label: impl Into<String>,
         f: impl FnOnce(&mut ActionBuilder),
     ) -> Option<Assist> {
-        let label = AssistLabel::new(label.into(), id);
+        let label = AssistLabel::new(id, label.into());
 
         let mut info = AssistInfo::new(label);
         if self.should_compute_edit {
@@ -157,7 +157,7 @@ impl<'a> AssistGroup<'a> {
         label: impl Into<String>,
         f: impl FnOnce(&mut ActionBuilder),
     ) {
-        let label = AssistLabel::new(label.into(), id);
+        let label = AssistLabel::new(id, label.into());
 
         let mut info = AssistInfo::new(label).with_group(GroupLabel(self.group_name.clone()));
         if self.ctx.should_compute_edit {

crates/ra_assists/src/lib.rs

@@ -32,16 +32,16 @@ pub struct AssistId(pub &'static str);
 
 #[derive(Debug, Clone)]
 pub struct AssistLabel {
+    pub id: AssistId,
     /// Short description of the assist, as shown in the UI.
     pub label: String,
-    pub id: AssistId,
 }
 
 #[derive(Clone, Debug)]
 pub struct GroupLabel(pub String);
 
 impl AssistLabel {
-    pub(crate) fn new(label: String, id: AssistId) -> AssistLabel {
+    pub(crate) fn new(id: AssistId, label: String) -> AssistLabel {
         // FIXME: make fields private, so that this invariant can't be broken
         assert!(label.starts_with(|c: char| c.is_uppercase()));
         AssistLabel { label, id }