Merge remote-tracking branch 'origin/main' into renameable-time-field

Author: msrd0

.github/PULL_REQUEST_TEMPLATE.md

@@ -4,9 +4,7 @@
 
 ### Checklist
 - [ ] Formatted code using `cargo fmt --all`
-- [ ] Linted code using clippy
-  - [ ] with reqwest feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features serde,derive,reqwest-client-rustls -- -D warnings`
-  - [ ] with surf feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features serde,derive,hyper-client -- -D warnings`
+- [ ] Linted code using clippy with reqwest feature: `cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features chrono,time,serde,derive,reqwest-client-rustls -- -D warnings`
 - [ ] Updated README.md using `cargo doc2readme -p influxdb --expand-macros`
 - [ ] Reviewed the diff. Did you leave any print statements or unnecessary comments?
 - [ ] Any unfinished work that warrants a separate issue captured in an issue with a TODO code comment

.github/workflows/rust.yml

@@ -12,7 +12,7 @@ jobs:
     name: README Format Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: docker://codeberg.org/msrd0/cargo-doc2readme:nightly
         with:
           entrypoint: cargo
@@ -23,41 +23,27 @@ jobs:
     name: Style Check (clippy)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.75.0
+      - uses: actions/checkout@v5
+      - uses: dtolnay/rust-toolchain@1.88.0
         with:
           components: clippy
+      - name: Update Cargo.lock
+        run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update
       - name: Check Clippy lints (reqwest)
-        run: cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features serde,derive,reqwest-client-rustls -- -D warnings
-      - name: Check Clippy lints (surf)
-        run: cargo clippy --manifest-path influxdb/Cargo.toml --all-targets --no-default-features --features serde,derive,hyper-client -- -D warnings
+        run: cargo clippy --manifest-path influxdb/Cargo.toml --locked --all-targets --no-default-features --features chrono,time,serde,derive,reqwest-client-rustls -- -D warnings
 
   # this checks that the code is formatted with rustfmt
   rustfmt:
     name: Style Checks (rustfmt)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@nightly
         with:
           components: rustfmt
       - name: Check code formatting
         run: cargo fmt --all -- --check
 
-  # this checks the msrv
-  msrv:
-    name: Verify MSRV
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: baptiste0928/cargo-install@v3
-        with:
-          crate: cargo-msrv
-      - name: Verify minimum rust version of influxdb crate
-        run: cargo msrv --path influxdb --output-format json verify
-      - name: Verify minimum rust version of influxdb_derive crate
-        run: cargo msrv --path influxdb_derive --output-format json verify
-
   # this tests that all unit and doc tests are successful
   unit_tests:
     name: Unit and Doc Tests (Rust ${{matrix.rust.name}} on ${{matrix.os}})
@@ -77,21 +63,51 @@ jobs:
             toolchain: nightly
             nightly: true
         os: [ubuntu-latest, windows-latest, macOS-latest]
+        include:
+          - rust:
+              name: MSRV
+              toolchain: stable
+              nightly: false
+            os: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust.toolchain}}
         id: rust-toolchain
+      - run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update
+      # on msrv runs, downgrade rust after generating the Cargo.lock file
+      - run: sudo apt -y update && sudo apt -y install --no-install-recommends yq
+        if: matrix.rust.name == 'MSRV'
+      - run: echo "rust-version=$(tomlq -r '.workspace.package."rust-version"' Cargo.toml)" >>$GITHUB_OUTPUT
+        id: msrv
+        if: matrix.rust.name == 'MSRV'
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{steps.msrv.outputs.rust-version}}
+        id: msrv-toolchain
+        if: matrix.rust.name == 'MSRV'
+      # on non-msrv runs, use one cache key ...
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/git
+            ~/.cargo/registry
+            target
+          key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}"
+        if: matrix.rust.name != 'MSRV'
+      # ... and on msrv runs, use another
       - uses: actions/cache@v4
         with:
           path: |
             ~/.cargo/git
             ~/.cargo/registry
             target
-          key: "${{matrix.rust.toolchain}} on ${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}"
-      - run: cargo test --lib
-      - run: cargo test --doc
+          key: "${{runner.os}} Rust ${{steps.msrv-toolchain.outputs.cachekey}}"
+        if: matrix.rust.name == 'MSRV'
+      # finally we can run tests
+      - run: cargo test --lib --locked --features 'chrono time serde derive'
+      - run: cargo test --doc --locked --features 'chrono time serde derive'
 
   # this tests that all integration tests are successful
   integration_tests:
@@ -106,10 +122,6 @@ jobs:
             toolchain: stable
             nightly: false
         http-backend:
-          - curl-client
-          - h1-client
-          - h1-client-rustls
-          - hyper-client
           - reqwest-client-rustls
           - reqwest-client-native-tls
           - reqwest-client-native-tls-vendored
@@ -140,7 +152,7 @@ jobs:
           DOCKER_INFLUXDB_INIT_BUCKET: mydb
           DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: admintoken
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust.toolchain}}
@@ -154,10 +166,12 @@ jobs:
           key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}"
       - name: Run tests
         run: |
-          for test in integration_tests{,_v2}
-          do
-            cargo test -p influxdb --no-default-features --features 'serde derive ${{matrix.http-backend}}' --no-fail-fast --test $test
-          done
+          cargo test -p influxdb \
+            --no-default-features \
+            --features "serde derive chrono time ${{matrix.http-backend}}" \
+            --no-fail-fast \
+            --test integration_tests \
+            --test integration_tests_v2
 
   # this uses cargo-tarpaulin to inspect the code coverage
   coverage:
@@ -180,7 +194,7 @@ jobs:
           INFLUXDB_USER_PASSWORD: password
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: dtolnay/rust-toolchain@stable
         id: rust-toolchain
       - name: Get Tarpaulin Version
@@ -203,7 +217,7 @@ jobs:
           cargo tarpaulin -v \
             --target-dir target/tarpaulin \
             --workspace \
-            --features serde,derive \
+            --features chrono,time,serde,derive \
             --exclude-files 'derive/*' \
             --exclude-files 'target/*' \
             --ignore-panics --ignore-tests \
@@ -225,10 +239,10 @@ jobs:
       - coverage
     if: github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: gh-pages
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           name: tarpaulin-report
       - run: |

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+ - `<dyn Query>::raw_read_query`, deprecated in 0.5.0, was removed
+
 ## [0.7.2] - 2024-02-14
 
 ### Fixed

Cargo.toml

@@ -2,6 +2,23 @@
 
 [workspace]
 members = ["influxdb", "influxdb_derive", "benches"]
+resolver = "2"
+
+[workspace.package]
+authors = ["Gero Gerke <git@gero.dev>", "Dominic <git@msrd0.de>"]
+edition = "2021"
+rust-version = "1.67.1"
+license = "MIT"
+repository = "https://github.com/influxdb-rs/influxdb-rust"
+
+[workspace.lints.rust]
+bare_trait_objects = "forbid"
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin)', 'cfg(tarpaulin_include)'] }
+
+[workspace.lints.clippy]
+multiple_bound_locations = "allow" # clippy has wrong opinions
+needless_doctest_main = "allow"
+needless_lifetimes = "allow" # False positive in client/mod.rs query fn
 
 [patch.crates-io]
 influxdb = { path = "./influxdb" }

README.j2

@@ -25,8 +25,8 @@
     <a href="https://www.rust-lang.org/en-US/">
         <img src="https://img.shields.io/badge/Made%20with-Rust-orange.svg" alt='Build with Rust' />
     </a>
-    <a href="https://blog.rust-lang.org/2022/11/03/Rust-1.67.0.html">
-        <img src="https://img.shields.io/badge/rustc-1.67+-yellow.svg" alt='Minimum Rust Version: 1.67' />
+    <a href="https://github.com/rust-lang/rust/releases/tag/{{ rust_version | urlencode }}">
+        <img src="https://img.shields.io/badge/rustc-{{ rust_version | urlencode }}+-yellow.svg" alt='Minimum Rust Version: {{ rust_version }}' />
     </a>
 </p>