Skip to content

Resolve clippy type_complexity warnings in geophysical config prompts #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbrodovsky merged 2 commits into from
Jan 9, 2026
Merged

Resolve clippy type_complexity warnings in geophysical config prompts #219

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf63e5b
Initial plan
Copilot Jan 9, 2026
d386dd2
Simplify geophysical config prompting functions by adding type alias
Copilot Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions sim/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,21 @@ fn prompt_enable_geophysical() -> bool {
}
}

/// Type alias for geophysical measurement configuration returned by prompt functions.
///
/// Represents the configuration for a single geophysical measurement type (gravity or magnetic).
/// Contains:
/// - `GeoResolution`: The map resolution to use
/// - `Option<f64>`: Measurement bias (mGal for gravity, nT for magnetic)
/// - `Option<f64>`: Measurement noise standard deviation (mGal for gravity, nT for magnetic)
/// - `Option<String>`: Map file path (auto-detected if None)
type GeoMeasurementConfig = (
strapdown::sim::GeoResolution,
Option<f64>,
Option<f64>,
Option<String>,
);

/// Prompt for GeoResolution with validation
fn prompt_geo_resolution(measurement_type: &str) -> strapdown::sim::GeoResolution {
use std::io::{self, Write};
Expand Down Expand Up @@ -1457,12 +1472,7 @@ fn prompt_geo_resolution(measurement_type: &str) -> strapdown::sim::GeoResolutio
}

/// Prompt for gravity measurement configuration
fn prompt_gravity_config() -> Option<(
strapdown::sim::GeoResolution,
Option<f64>,
Option<f64>,
Option<String>,
)> {
fn prompt_gravity_config() -> Option<GeoMeasurementConfig> {
use std::io::{self, Write};

loop {
Expand Down Expand Up @@ -1523,12 +1533,7 @@ fn prompt_gravity_config() -> Option<(
}

/// Prompt for magnetic measurement configuration
fn prompt_magnetic_config() -> Option<(
strapdown::sim::GeoResolution,
Option<f64>,
Option<f64>,
Option<String>,
)> {
fn prompt_magnetic_config() -> Option<GeoMeasurementConfig> {
use std::io::{self, Write};

loop {
Expand Down