Order every file public-before-private

Clear the pre-existing lint-rust-step-down backlog: within each module and
impl block, public items now come before private helpers. Pure reordering
of existing functions — no behaviour change. `just lint` is now fully green.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: gajop

native/src/sbc/map_settings/ui/water/model.rs

@@ -33,20 +33,6 @@ pub(crate) enum WaterField {
 
 use WaterField::*;
 
-fn num(name: &'static str, title: &'static str) -> Box<NumericField> {
-    Box::new(NumericField::new(name, title, 0.0).decimals(2))
-}
-
-/// Water textures live under the engine VFS's `bitmaps/`, as in
-/// `water_editor.lua` — that is engine content, not an asset pack, so the
-/// picker browses the VFS directly.
-fn tex(name: &'static str, title: &'static str) -> Box<AssetField> {
-    Box::new(
-        AssetField::new(name, title, "vfs:bitmaps")
-            .extensions(&[".png", ".jpg", ".tga", ".dds", ".bmp"]),
-    )
-}
-
 /// Every field here is a key of `SetWaterParamsCommand`'s options, so the
 /// dispatch is uniform: send the one field that changed.
 ///
@@ -104,3 +90,17 @@ pub(crate) fn water_model() -> TableModel<WaterField> {
         entry(Texture, tex("texture", "Texture")),
     ])
 }
+
+fn num(name: &'static str, title: &'static str) -> Box<NumericField> {
+    Box::new(NumericField::new(name, title, 0.0).decimals(2))
+}
+
+/// Water textures live under the engine VFS's `bitmaps/`, as in
+/// `water_editor.lua` — that is engine content, not an asset pack, so the
+/// picker browses the VFS directly.
+fn tex(name: &'static str, title: &'static str) -> Box<AssetField> {
+    Box::new(
+        AssetField::new(name, title, "vfs:bitmaps")
+            .extensions(&[".png", ".jpg", ".tga", ".dds", ".bmp"]),
+    )
+}

native/src/sbc/objects/ui/properties/model.rs

@@ -43,6 +43,10 @@ impl Position {
         })
     }
 
+    pub(super) fn json(self) -> serde_json::Value {
+        serde_json::json!({ "x": self.x, "y": self.y, "z": self.z })
+    }
+
     fn from_fields(model: &PropertiesModel, field: &str) -> Self {
         Self {
             x: model.number(&component_name(field, "x")),
@@ -66,10 +70,6 @@ impl Position {
             z: self.z - other.z,
         }
     }
-
-    pub(super) fn json(self) -> serde_json::Value {
-        serde_json::json!({ "x": self.x, "y": self.y, "z": self.z })
-    }
 }
 
 #[derive(Clone)]
@@ -84,15 +84,28 @@ pub(super) fn is_angle(field: &str) -> bool {
     field == "rot"
 }
 
+pub(super) fn sub_parts(name: &str) -> Option<(&str, &str)> {
+    name.split_once('.')
+}
+
+pub(super) fn number_f(value: &serde_json::Value) -> f32 {
+    value.as_f64().unwrap_or(0.0) as f32
+}
+
+pub(super) fn component_name(field: &str, axis: &str) -> String {
+    format!("{field}_{axis}")
+}
+
+pub(super) fn component(name: &str) -> Option<(&str, &str)> {
+    let (field, axis) = name.rsplit_once('_')?;
+    matches!(axis, "x" | "y" | "z").then_some((field, axis))
+}
+
 /// A sub-object's field, named `parent.key` (Lua's `name .. tkey`).
 fn sub_name(parent: &str, key: &str) -> String {
     format!("{parent}.{key}")
 }
 
-pub(super) fn sub_parts(name: &str) -> Option<(&str, &str)> {
-    name.split_once('.')
-}
-
 /// Lua sends only the changed key for these, rather than the whole table: the
 /// setters apply the keys they are given, and resending the rest would fight
 /// with the engine's own bookkeeping.
@@ -143,27 +156,12 @@ impl PropertiesModel {
         }
     }
 
-    fn value(&self, name: &str) -> FieldValue {
-        self.fields
-            .iter()
-            .find(|field| field.name() == name)
-            .map(|field| field.value())
-            .unwrap_or(FieldValue::Text(String::new()))
-    }
-
     pub(super) fn set(&mut self, name: &str, value: FieldValue) {
         if let Some(field) = self.fields.iter_mut().find(|field| field.name() == name) {
             field.set_value(&value);
         }
     }
 
-    fn number(&self, name: &str) -> f32 {
-        match self.value(name) {
-            FieldValue::Number(n) => n,
-            _ => 0.0,
-        }
-    }
-
     /// Build the fields for one object.
     ///
     /// Generic sub-objects (`states`, `resources`, ...) and the rules map have
@@ -370,6 +368,55 @@ impl PropertiesModel {
             .collect()
     }
 
+    pub(super) fn set_json_field(&mut self, name: &str, value: &serde_json::Value) {
+        // The team choice shows names, so the stored id has to be mapped back.
+        if name == "team" {
+            if let Some(team) = value.as_i64().and_then(|id| self.team_name(id as i32)) {
+                self.set(name, FieldValue::Text(team));
+            }
+            return;
+        }
+        if let Some(value) = value.as_bool() {
+            self.set(name, FieldValue::Bool(value));
+        } else if let Some(value) = value.as_str() {
+            self.set(name, FieldValue::Text(value.to_string()));
+        } else if value.is_number() {
+            self.set(name, number(value));
+        }
+    }
+
+    /// The reverse of `sub_value`: put a sub-object key into its field.
+    pub(super) fn set_sub_field(&mut self, name: &str, key: &str, value: &serde_json::Value) {
+        let captions = match key {
+            "fireState" => Some(FIRE_STATES),
+            "moveState" => Some(MOVE_STATES),
+            _ => None,
+        };
+        if let Some(captions) = captions {
+            let index = value.as_i64().unwrap_or(0) as usize;
+            if let Some(caption) = captions.get(index) {
+                self.set(name, FieldValue::Text((*caption).to_string()));
+            }
+            return;
+        }
+        self.set_json_field(name, value);
+    }
+
+    fn value(&self, name: &str) -> FieldValue {
+        self.fields
+            .iter()
+            .find(|field| field.name() == name)
+            .map(|field| field.value())
+            .unwrap_or(FieldValue::Text(String::new()))
+    }
+
+    fn number(&self, name: &str) -> f32 {
+        match self.value(name) {
+            FieldValue::Number(n) => n,
+            _ => 0.0,
+        }
+    }
+
     fn sub_fields_of(&self, parent: &str) -> Vec<String> {
         self.layout
             .iter()
@@ -413,40 +460,6 @@ impl PropertiesModel {
             .find(|(team_id, _)| *team_id == id)
             .map(|(_, name)| name.clone())
     }
-
-    pub(super) fn set_json_field(&mut self, name: &str, value: &serde_json::Value) {
-        // The team choice shows names, so the stored id has to be mapped back.
-        if name == "team" {
-            if let Some(team) = value.as_i64().and_then(|id| self.team_name(id as i32)) {
-                self.set(name, FieldValue::Text(team));
-            }
-            return;
-        }
-        if let Some(value) = value.as_bool() {
-            self.set(name, FieldValue::Bool(value));
-        } else if let Some(value) = value.as_str() {
-            self.set(name, FieldValue::Text(value.to_string()));
-        } else if value.is_number() {
-            self.set(name, number(value));
-        }
-    }
-
-    /// The reverse of `sub_value`: put a sub-object key into its field.
-    pub(super) fn set_sub_field(&mut self, name: &str, key: &str, value: &serde_json::Value) {
-        let captions = match key {
-            "fireState" => Some(FIRE_STATES),
-            "moveState" => Some(MOVE_STATES),
-            _ => None,
-        };
-        if let Some(captions) = captions {
-            let index = value.as_i64().unwrap_or(0) as usize;
-            if let Some(caption) = captions.get(index) {
-                self.set(name, FieldValue::Text((*caption).to_string()));
-            }
-            return;
-        }
-        self.set_json_field(name, value);
-    }
 }
 
 impl EditorModel for PropertiesModel {
@@ -488,10 +501,6 @@ fn number(value: &serde_json::Value) -> FieldValue {
     FieldValue::Number(number_f(value))
 }
 
-pub(super) fn number_f(value: &serde_json::Value) -> f32 {
-    value.as_f64().unwrap_or(0.0) as f32
-}
-
 fn index_of(captions: &[&str], value: &str) -> i32 {
     captions
         .iter()
@@ -552,15 +561,6 @@ fn sub_field(name: &str, key: &str, value: &serde_json::Value) -> Option<Box<dyn
     None
 }
 
-pub(super) fn component_name(field: &str, axis: &str) -> String {
-    format!("{field}_{axis}")
-}
-
-pub(super) fn component(name: &str) -> Option<(&str, &str)> {
-    let (field, axis) = name.rsplit_once('_')?;
-    matches!(axis, "x" | "y" | "z").then_some((field, axis))
-}
-
 fn title(name: &str) -> String {
     let mut out = String::new();
     for (i, ch) in name.chars().enumerate() {

native/src/sbc/panels/controls/asset_picker.rs

@@ -59,53 +59,6 @@ impl AssetPicker {
         self.field.as_deref()
     }
 
-    fn markup_rml(&self) -> String {
-        format!(
-            concat!(
-                r#"<div id="asset-picker" class="picker-backdrop hidden">"#,
-                r#"<div class="dialog picker-dialog asset-dialog">"#,
-                r#"<div class="dialog-header"><span class="dialog-title">Pick Asset</span></div>"#,
-                r#"<div class="dialog-content">"#,
-                r#"<div class="asset-path-nav">"#,
-                r#"<button id="asset-up" class="dialog-button">Up</button>"#,
-                r#"<span id="asset-path" class="asset-path"></span></div>"#,
-                r#"{grid}"#,
-                r#"</div>"#,
-                r#"<div class="dialog-footer">"#,
-                r#"<button id="asset-ok" class="dialog-button primary">OK</button>"#,
-                r#"<button id="asset-cancel" class="dialog-button">Cancel</button>"#,
-                r#"</div></div></div>"#,
-            ),
-            grid = self.grid.container_rml(),
-        )
-    }
-
-    fn bind_listeners(
-        &mut self,
-        interface: &NativeInterfaceRef,
-        document: u64,
-    ) -> Result<(), Error> {
-        if self.bound {
-            return Ok(());
-        }
-        let rml = interface.rml_ui();
-        for (id, event) in [
-            ("asset-ok", PickerEvent::Accept),
-            ("asset-cancel", PickerEvent::Cancel),
-            ("asset-up", PickerEvent::Up),
-        ] {
-            let Some(e) = element_by_id(interface, document, id) else {
-                continue;
-            };
-            let q = self.events.clone();
-            rml.element_add_event_listener(e, "click", false, move || {
-                q.borrow_mut().push(event);
-            })?;
-        }
-        self.bound = true;
-        Ok(())
-    }
-
     pub(crate) fn open(
         &mut self,
         interface: &NativeInterfaceRef,
@@ -193,6 +146,53 @@ impl AssetPicker {
         Ok(None)
     }
 
+    fn markup_rml(&self) -> String {
+        format!(
+            concat!(
+                r#"<div id="asset-picker" class="picker-backdrop hidden">"#,
+                r#"<div class="dialog picker-dialog asset-dialog">"#,
+                r#"<div class="dialog-header"><span class="dialog-title">Pick Asset</span></div>"#,
+                r#"<div class="dialog-content">"#,
+                r#"<div class="asset-path-nav">"#,
+                r#"<button id="asset-up" class="dialog-button">Up</button>"#,
+                r#"<span id="asset-path" class="asset-path"></span></div>"#,
+                r#"{grid}"#,
+                r#"</div>"#,
+                r#"<div class="dialog-footer">"#,
+                r#"<button id="asset-ok" class="dialog-button primary">OK</button>"#,
+                r#"<button id="asset-cancel" class="dialog-button">Cancel</button>"#,
+                r#"</div></div></div>"#,
+            ),
+            grid = self.grid.container_rml(),
+        )
+    }
+
+    fn bind_listeners(
+        &mut self,
+        interface: &NativeInterfaceRef,
+        document: u64,
+    ) -> Result<(), Error> {
+        if self.bound {
+            return Ok(());
+        }
+        let rml = interface.rml_ui();
+        for (id, event) in [
+            ("asset-ok", PickerEvent::Accept),
+            ("asset-cancel", PickerEvent::Cancel),
+            ("asset-up", PickerEvent::Up),
+        ] {
+            let Some(e) = element_by_id(interface, document, id) else {
+                continue;
+            };
+            let q = self.events.clone();
+            rml.element_add_event_listener(e, "click", false, move || {
+                q.borrow_mut().push(event);
+            })?;
+        }
+        self.bound = true;
+        Ok(())
+    }
+
     fn set_visible(
         &self,
         interface: &NativeInterfaceRef,