Merge branch 'main' into time

Author: Empty2k12

.github/workflows/rust.yml

@@ -12,8 +12,8 @@ jobs:
     name: README Format Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: docker://ghcr.io/msrd0/cargo-doc2readme:nightly
+      - uses: actions/checkout@v5
+      - uses: docker://codeberg.org/msrd0/cargo-doc2readme:nightly
         with:
           entrypoint: cargo
           args: doc2readme -p influxdb --expand-macros --check
@@ -23,10 +23,12 @@ 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 chrono,time,serde,derive,reqwest-client-rustls -- -D warnings
       - name: Check Clippy lints (surf)
@@ -37,7 +39,7 @@ jobs:
     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
@@ -53,9 +55,6 @@ jobs:
       fail-fast: false
       matrix:
         rust:
-          - name: MSRV
-            toolchain: "1.65"
-            nightly: false
           - name: Stable
             toolchain: stable
             nightly: false
@@ -66,21 +65,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}}"
-      - run: cargo test --lib
-      - run: cargo test --doc
+        if: matrix.rust.name != 'MSRV'
+      # ... and on msrv runs, use another
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/git
+            ~/.cargo/registry
+            target
+          key: "${{runner.os}} Rust ${{steps.msrv-toolchain.outputs.cachekey}}"
+        if: matrix.rust.name == 'MSRV'
+      # finally we can run tests
+      - run: cargo test --lib --locked
+      - run: cargo test --doc --locked
 
   # this tests that all integration tests are successful
   integration_tests:
@@ -129,7 +158,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}}
@@ -169,7 +198,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
@@ -214,10 +243,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

@@ -72,7 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -  Batch write support ([@sunng87](https://github.com/sunng87) in [#87](https://github.com/influxdb-rs/influxdb-rust/pull/87))
 
-    Build a query containing mutliple rows to be inserted
+    Build a query containing multiple rows to be inserted
     ```
     let q0 = Timestamp::Hours(11)
         .into_query("weather")

CONTRIBUTING.md

@@ -139,7 +139,7 @@ Please open an issue if you have suggestions for new labels.
 | Issue label          | List issues                                                                                  | Description                                                                            |
 | -------------------- | -------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
 | `Type: Bug`          | [search](https://github.com/influxdb-rs/influxdb-rust/labels/Status%3A%20Type%20Bug)           | Applied to issues reporting bugs.                                                      |
-| `Type: Chore`        | [search](https://github.com/influxdb-rs/influxdb-rust/labels/Status%3A%20Type%20Chore)         | Applied to issues and pull requests regarding miscellaneous tasks around the reposity. |
+| `Type: Chore`        | [search](https://github.com/influxdb-rs/influxdb-rust/labels/Status%3A%20Type%20Chore)         | Applied to issues and pull requests regarding miscellaneous tasks around the repository. |
 | `Type: Enhancement`  | [search](https://github.com/influxdb-rs/influxdb-rust/labels/Status%3A%20Type%20Enhancement)   | Applied to issues and pull requests where an existing feature is improved.             |
 | `Type: Governance`   | [search](https://github.com/influxdb-rs/influxdb-rust/labels/Status%3A%20Type%20Governance)    | Applied to issues pull requests regarding repository governance.                       |
 | `Type: New Feature`  | [search](https://github.com/influxdb-rs/influxdb-rust/labels/status%3a%20Type%20New%20Feature) | Applied to issues and pull requests requesting or implementing new features.           |  |

Cargo.toml

@@ -2,6 +2,23 @@
 
 [workspace]
 members = ["influxdb", "influxdb_derive", "benches"]
+resolver = "2"
+
+[workspace.package]
+authors = ["Gero Gerke <[email protected]>", "Dominic <[email protected]>"]
+edition = "2018"
+rust-version = "1.65"
+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.65.0.html">
-        <img src="https://img.shields.io/badge/rustc-1.65+-yellow.svg" alt='Minimum Rust Version: 1.65' />
+    <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>
 

README.md

@@ -25,40 +25,36 @@
     <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.65.0.html">
-        <img src="https://img.shields.io/badge/rustc-1.65+-yellow.svg" alt='Minimum Rust Version: 1.65' />
+    <a href="https://github.com/rust-lang/rust/releases/tag/1.65.0">
+        <img src="https://img.shields.io/badge/rustc-1.65.0+-yellow.svg" alt='Minimum Rust Version: 1.65.0' />
     </a>
 </p>
 
 Pull requests are always welcome. See [Contributing][__link0] and [Code of Conduct][__link1]. For a list of past changes, see [CHANGELOG.md][__link2].
 
-
 ### Currently Supported Features
 
- - Reading and writing to InfluxDB
- - Optional Serde support for deserialization
- - Running multiple queries in one request (e.g. `SELECT * FROM weather_berlin; SELECT * FROM weather_london`)
- - Writing single or multiple measurements in one request (e.g. `WriteQuery` or `Vec<WriteQuery>` argument)
- - Authenticated and unauthenticated connections
- - `async`/`await` support
- - `#[derive(InfluxDbWriteable)]` derive macro for writing / reading into structs
- - `GROUP BY` support
- - Tokio and async-std support (see example below) or [available backends][__link3]
- - Swappable HTTP backends ([see below](#Choice-of-HTTP-backend))
-
+* Reading and writing to InfluxDB
+* Optional Serde support for deserialization
+* Running multiple queries in one request (e.g. `SELECT * FROM weather_berlin; SELECT * FROM weather_london`)
+* Writing single or multiple measurements in one request (e.g. `WriteQuery` or `Vec<WriteQuery>` argument)
+* Authenticated and unauthenticated connections
+* `async`/`await` support
+* `#[derive(InfluxDbWriteable)]` derive macro for writing / reading into structs
+* `GROUP BY` support
+* Tokio and async-std support (see example below) or [available backends][__link3]
+* Swappable HTTP backends ([see below](#Choice-of-HTTP-backend))
 
 ## Quickstart
 
 Add the following to your `Cargo.toml`
 
-
 ```toml
 influxdb = { version = "0.7.2", features = ["derive"] }
 ```
 
 For an example with using Serde deserialization, please refer to [serde_integration][__link4]
 
-
 ```rust
 use chrono::{DateTime, Utc};
 use influxdb::{Client, Error, InfluxDbWriteable, ReadQuery, Timestamp};
@@ -104,73 +100,62 @@ async fn main() -> Result<(), Error> {
 }
 ```
 
-For further examples, check out the integration tests in `tests/integration_tests.rs` in the repository.
-
+For further examples, check out the integration tests in `tests/integration_tests.rs`
+in the repository.
 
 ## Choice of HTTP backend
 
 To communicate with InfluxDB, you can choose the HTTP backend to be used configuring the appropriate feature. We recommend sticking with the default reqwest-based client, unless you really need async-std compatibility.
 
- - **[hyper][__link5]** (through reqwest, used by default), with [rustls][__link6]
-	```toml
-	influxdb = { version = "0.7.2", features = ["derive"] }
-	```
-	
-	
- - **[hyper][__link7]** (through reqwest), with native TLS (OpenSSL)
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls"] }
-	```
-	
-	
- - **[hyper][__link8]** (through reqwest), with vendored native TLS (OpenSSL)
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls-vendored"] }
-	```
-	
-	
- - **[hyper][__link9]** (through surf), use this if you need tokio 0.2 compatibility
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "hyper-client"] }
-	```
-	
-	
- - **[curl][__link10]**, using [libcurl][__link11]
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "curl-client"] }
-	```
-	
-	
- - **[async-h1][__link12]** with native TLS (OpenSSL)
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "h1-client"] }
-	```
-	
-	
- - **[async-h1][__link13]** with [rustls][__link14]
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "h1-client-rustls"] }
-	```
-	
-	
- - WebAssembly’s `window.fetch`, via `web-sys` and **[wasm-bindgen][__link15]**
-	```toml
-	influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "wasm-client"] }
-	```
-	
-	
-
+* **[hyper][__link5]** (through reqwest, used by default), with [rustls][__link6]
+  ```toml
+  influxdb = { version = "0.7.2", features = ["derive"] }
+  ```
+
+* **[hyper][__link7]** (through reqwest), with native TLS (OpenSSL)
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls"] }
+  ```
+
+* **[hyper][__link8]** (through reqwest), with vendored native TLS (OpenSSL)
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "reqwest-client-native-tls-vendored"] }
+  ```
+
+* **[hyper][__link9]** (through surf), use this if you need tokio 0.2 compatibility
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "hyper-client"] }
+  ```
+
+* **[curl][__link10]**, using [libcurl][__link11]
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "curl-client"] }
+  ```
+
+* **[async-h1][__link12]** with native TLS (OpenSSL)
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "h1-client"] }
+  ```
+
+* **[async-h1][__link13]** with [rustls][__link14]
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "h1-client-rustls"] }
+  ```
+
+* WebAssembly’s `window.fetch`, via `web-sys` and **[wasm-bindgen][__link15]**
+  ```toml
+  influxdb = { version = "0.7.2", default-features = false, features = ["derive", "serde", "wasm-client"] }
+  ```
 
 ## License
 
-[![License: MIT][__link16]][__link17]
-
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)][__link16]
 
 
 @ 2020-2024 Gero Gerke, msrd0 and [contributors].
 
  [contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors
- [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG_RDmlyxxvyrG0rwcLBKoYdvG5It9hbWNgjUGzjD8iBYfsFFYXKEG1LaAVLASZMqG5J2qfpyCvbMG_Rohh5BobOmG0DqLv5454SZYWSBgmhpbmZsdXhkYmUwLjcuMg
+ [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEGzJ_QpW55zB1G0S-TER-rIfLG2gXv8EYBG3jG1nuXXn-kdx-YXKEG1LaAVLASZMqG5J2qfpyCvbMG_Rohh5BobOmG0DqLv5454SZYWSBgmhpbmZsdXhkYmUwLjcuMg
  [__link0]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CONTRIBUTING.md
  [__link1]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CODE_OF_CONDUCT.md
  [__link10]: https://github.com/alexcrichton/curl-rust
@@ -179,8 +164,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu
  [__link13]: https://github.com/http-rs/async-h1
  [__link14]: https://github.com/ctz/rustls
  [__link15]: https://github.com/rustwasm/wasm-bindgen
- [__link16]: https://img.shields.io/badge/License-MIT-yellow.svg
- [__link17]: https://opensource.org/licenses/MIT
+ [__link16]: https://opensource.org/licenses/MIT
  [__link2]: https://github.com/influxdb-rs/influxdb-rust/blob/main/CHANGELOG.md
  [__link3]: https://github.com/influxdb-rs/influxdb-rust/blob/main/influxdb/Cargo.toml
  [__link4]: https://docs.rs/influxdb/0.7.2/influxdb/?search=integrations::serde_integration

RELEASING.md

@@ -1,11 +1,11 @@
 # How to release this crate
 
-This project consists of two crates which need to be published to crates.io in the correct order. Additonally, there's some steps one's likely to miss when releasing.
+This project consists of two crates which need to be published to crates.io in the correct order. Additionally, there's some steps one's likely to miss when releasing.
 
 ## Pre-Release-Checklist
 
 - [ ] `influxdb/Cargo.toml` and `influxdb-derive/Cargo.toml`: Bumped `influxdb` and `influxdb-derive` versions to new version number?
-- [ ] `influxdb/Cargo.toml`: Changed `influxdb` dependecy on `influxdb-derive` to new version number?
+- [ ] `influxdb/Cargo.toml`: Changed `influxdb` dependency on `influxdb-derive` to new version number?
 - [ ] `CHANGELOG.md`: Remove all entries from the unreleased section
 - [ ] `CHANGELOG.md`: Add new Section for the new version number with subsections `Added`, `Changed` and `Fixed`.
 - [ ] `CHANGELOG.md`: For each commit since the last release commit `Release vX.Y.Z`, added a changelog entry in the correct section linking to the author and PR in this format?