Skip to content

improve fmt and related just commands#1854

Merged
nyurik merged 1 commit intomaplibre:mainfrom
nyurik:fmt
May 26, 2025
Merged

improve fmt and related just commands#1854
nyurik merged 1 commit intomaplibre:mainfrom
nyurik:fmt

Conversation

@nyurik
Copy link
Copy Markdown
Member

@nyurik nyurik commented May 26, 2025

  • consolidated just fmt will format using nightly (preferred) or regular cargo fmt. This is identical to what we had before as just fmt2
  • remove unused rustfmt.toml
  • reformatted everything

@nyurik nyurik requested review from CommanderStorm, Copilot and sharkAndshark and removed request for Copilot May 26, 2025 01:29
@nyurik nyurik enabled auto-merge (squash) May 26, 2025 01:29
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

Consolidates and simplifies formatting targets, removes unused config, and applies consistent reformatting across the codebase.

  • Deletes obsolete rustfmt.toml
  • Merges nightly and stable cargo fmt into one just fmt recipe (with fallback)
  • Reorders and combines imports in modules for a consistent style

Reviewed Changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
rustfmt.toml Removed unused rustfmt configuration
martin/src/styles/mod.rs Reordered use statements
martin/src/srv/styles.rs Consolidated Actix imports and moved StyleSources import
martin/src/sprites/mod.rs Combined collection imports
martin/src/source.rs Moved HashMap import to file top
martin/src/pmtiles/mod.rs Split AWS S3 imports onto separate lines
martin/src/fonts/mod.rs Removed duplicated HashMap import
martin/src/cog/source.rs Reordered test use statements
martin/src/cog/model.rs Split tiff imports
martin/src/args/root.rs Simplified clap imports
justfile Updated formatting/checking recipes (fmt, test-fmt), removed --unsorted from default
Comments suppressed due to low confidence (1)

martin/src/pmtiles/mod.rs:13

  • [nitpick] For brevity and consistency, you could combine these two imports into use pmtiles::aws_sdk_s3::{Client as S3Client, config::Builder as S3ConfigBuilder};.
use pmtiles::aws_sdk_s3::Client as S3Client;

* consolidated `just fmt` will format using nightly (preferred) or regular `cargo fmt`. This is identical to what we had before as `just fmt2`
* remove unused rustfmt.toml
* reformatted everything
Copy link
Copy Markdown
Member

@CommanderStorm CommanderStorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thanks

@nyurik nyurik merged commit 82da542 into maplibre:main May 26, 2025
20 checks passed
@nyurik nyurik deleted the fmt branch May 26, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants