From c619079984e040e55b6dbef3d109e886dbfdb57c Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Thu, 21 Dec 2023 19:27:30 -0500 Subject: [PATCH] lints --- .github/workflows/ci.yml | 9 +++++---- martin/src/bin/martin-cp.rs | 2 +- mbtiles/tests/copy.rs | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d39091a6..9e6342609 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,7 +115,7 @@ jobs: tool: cross - name: Checkout sources uses: actions/checkout@v4 - with: + with: set-safe-directory: false - uses: Swatinem/rust-cache@v2 if: github.event_name != 'release' && github.event_name != 'workflow_dispatch' @@ -336,7 +336,7 @@ jobs: dir echo "$PWD.Path" # Replace the default Nginx configuration file - + $nginxConf = @" worker_processes 1; events { @@ -355,8 +355,9 @@ jobs: index index.html index.htm; } } - }"@ - + } + "@ + Set-Content -Path "C:\tools\nginx-1.25.3\conf\nginx.conf" -Value $nginxConf Get-Content -Path "C:\tools\nginx-1.25.3\conf\nginx.conf" - name: Start Nginx (on Windows systems) diff --git a/martin/src/bin/martin-cp.rs b/martin/src/bin/martin-cp.rs index 55ebe0928..1c67545dc 100644 --- a/martin/src/bin/martin-cp.rs +++ b/martin/src/bin/martin-cp.rs @@ -71,7 +71,7 @@ pub struct CopyArgs { pub url_query: Option, /// Optional accepted encoding parameter as if the browser sent it in the HTTP request. /// If set to multiple values like `gzip,br`, martin-cp will use the first encoding, - /// or re-encode if the tile is already encoded and that encoding is not listed. + /// or re-encode if the tile is already encoded and that encoding is not listed. /// Use `identity` to disable compression. Ignored for non-encodable tiles like PNG and JPEG. #[arg(long, alias = "encodings", default_value = "gzip")] pub encoding: String, diff --git a/mbtiles/tests/copy.rs b/mbtiles/tests/copy.rs index 0e33b9600..f17dc5f3e 100644 --- a/mbtiles/tests/copy.rs +++ b/mbtiles/tests/copy.rs @@ -52,7 +52,7 @@ const TILES_V2: &str = " -- , (6, 2, 6, cast('1-keep-1-rm' as blob)) -- this row is removed , (5, 3, 7, cast('new' as blob)) -- this row is added, dup value , (5, 3, 8, cast('new' as blob)) -- this row is added, dup value - + -- Expected delta: -- 5/1/1 edit -- 5/1/2 edit