From b4091c4f610e2637e025c01da74bfc1252b54c9c Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:00:10 +0100 Subject: [PATCH 01/16] CI: Use cargo 1.84 feature to check MSRV --- .github/workflows/rust.yml | 24 +++++++++++++++++++++--- Cargo.toml | 7 +++++++ README.j2 | 4 ++-- influxdb/Cargo.toml | 10 +++++----- influxdb_derive/Cargo.toml | 10 +++++----- 5 files changed, 40 insertions(+), 15 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index bc94844..7e5a0e3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -67,6 +67,9 @@ jobs: fail-fast: false matrix: rust: + - name: MSRV + toolchain: stable + nightly: false - name: Stable toolchain: stable nightly: false @@ -79,19 +82,34 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] steps: - uses: actions/checkout@v4 + # on non-msrv runs, just download rust - uses: dtolnay/rust-toolchain@master with: toolchain: ${{matrix.rust.toolchain}} id: rust-toolchain + if: matrix.rust.name != 'MSRV' + # on msrv runs, use stable to generate Cargo.lock then downgrade + - uses: dtolnay/rust-toolchain@stable + if: matrix.rust.name == 'MSRV' + - run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update + - 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: rust-toolchain + if: matrix.rust.name == 'MSRV' + # the rest is independent of whether msrv is used - 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.rust-toolchain.outputs.cachekey}}" + - run: cargo test --lib --locked + - run: cargo test --doc --locked # this tests that all integration tests are successful integration_tests: diff --git a/Cargo.toml b/Cargo.toml index d87619e..b7a30bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,13 @@ [workspace] members = ["influxdb", "influxdb_derive", "benches"] +[workspace.package] +authors = ["Gero Gerke <11deutron11@gmail.com>", "Dominic "] +edition = "2018" +rust-version = "1.65" +license = "MIT" +repository = "https://github.com/influxdb-rs/influxdb-rust" + [patch.crates-io] influxdb = { path = "./influxdb" } influxdb_derive = { path = "./influxdb_derive" } diff --git a/README.j2 b/README.j2 index be728de..ead28b4 100644 --- a/README.j2 +++ b/README.j2 @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.67 + + Minimum Rust Version: 1.65

diff --git a/influxdb/Cargo.toml b/influxdb/Cargo.toml index c31729a..f88f841 100644 --- a/influxdb/Cargo.toml +++ b/influxdb/Cargo.toml @@ -3,15 +3,15 @@ [package] name = "influxdb" version = "0.7.2" -authors = ["Gero Gerke <11deutron11@gmail.com>"] -edition = "2018" +authors.workspace = true +edition.workspace = true +rust-version.workspace = true description = "InfluxDB Driver for Rust" keywords = ["influxdb", "database", "influx"] -license = "MIT" +license.workspace = true readme = "README.md" include = ["src/**/*", "tests/**/*", "Cargo.toml", "LICENSE"] -repository = "https://github.com/influxdb-rs/influxdb-rust" -rust-version = "1.70" +repository.workspace = true [dependencies] chrono = { version = "0.4.23", features = ["serde"], default-features = false } diff --git a/influxdb_derive/Cargo.toml b/influxdb_derive/Cargo.toml index 6e4b377..7c5df57 100644 --- a/influxdb_derive/Cargo.toml +++ b/influxdb_derive/Cargo.toml @@ -3,15 +3,15 @@ [package] name = "influxdb_derive" version = "0.5.1" -authors = ["Gero Gerke <11deutron11@gmail.com>"] -edition = "2018" +authors.workspace = true +edition.workspace = true +rust-version.workspace = true description = "Private implementation detail of the influxdb crate" keywords = ["influxdb", "database", "influx", "derive"] -license = "MIT" +license.workspace = true readme = "README.md" include = ["src/**/*", "tests/**/*", "Cargo.toml", "LICENSE"] -repository = "https://github.com/influxdb-rs/influxdb-rust" -rust-version = "1.70" +repository.workspace = true [lib] proc-macro = true From 2aeccfa4cea64df3dd88b65863a037737c5e0965 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:03:40 +0100 Subject: [PATCH 02/16] github actions is stupid --- .github/workflows/rust.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7e5a0e3..4f081a6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -82,15 +82,11 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] steps: - uses: actions/checkout@v4 - # on non-msrv runs, just download rust - uses: dtolnay/rust-toolchain@master with: toolchain: ${{matrix.rust.toolchain}} id: rust-toolchain - if: matrix.rust.name != 'MSRV' # on msrv runs, use stable to generate Cargo.lock then downgrade - - uses: dtolnay/rust-toolchain@stable - if: matrix.rust.name == 'MSRV' - run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update - run: echo "rust-version=$(tomlq -r '.workspace.package."rust-version"' Cargo.toml)" >>$GITHUB_OUTPUT id: msrv @@ -98,9 +94,9 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{steps.msrv.outputs.rust-version}} - id: rust-toolchain + id: msrv-toolchain if: matrix.rust.name == 'MSRV' - # the rest is independent of whether msrv is used + # on non-msrv runs, use one cache key ... - uses: actions/cache@v4 with: path: | @@ -108,6 +104,15 @@ jobs: ~/.cargo/registry target key: "${{runner.os}} Rust ${{steps.rust-toolchain.outputs.cachekey}}" + # ... 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}}" + # finally we can run tests - run: cargo test --lib --locked - run: cargo test --doc --locked From 8dd3a76de14544c0882e8ea30a97c1878ce05802 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:04:12 +0100 Subject: [PATCH 03/16] kill the other msrv job --- .github/workflows/rust.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4f081a6..5c61309 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -44,20 +44,6 @@ jobs: - 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}}) From 8489a1dbde7d713b59ea04d7b7bba6cf9a6b7d86 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:06:11 +0100 Subject: [PATCH 04/16] need to install yq --- .github/workflows/rust.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5c61309..56eda93 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -72,8 +72,10 @@ jobs: with: toolchain: ${{matrix.rust.toolchain}} id: rust-toolchain - # on msrv runs, use stable to generate Cargo.lock then downgrade - run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update + # on msrv runs, downgrade rust after generating the Cargo.lock file + - run: apk -y update && apk -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' From 968a5565bf3122920c5af1f61064a180476db2f3 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:06:27 +0100 Subject: [PATCH 05/16] debian typo's apk as apt --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 56eda93..1e910ef 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -74,7 +74,7 @@ jobs: id: rust-toolchain - run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update # on msrv runs, downgrade rust after generating the Cargo.lock file - - run: apk -y update && apk -y install --no-install-recommends yq + - run: apt -y update && 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 From 61d62a239f01a417d50b477cf73b2755e2a28b65 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:07:48 +0100 Subject: [PATCH 06/16] apt needs sudo --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1e910ef..7b4de05 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -74,7 +74,7 @@ jobs: id: rust-toolchain - run: cargo --config 'resolver.incompatible-rust-versions="fallback"' update # on msrv runs, downgrade rust after generating the Cargo.lock file - - run: apt -y update && apt -y install --no-install-recommends yq + - 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 From 3d6bd4a86c0e1f28808985370a78a13bd178b3a3 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:09:11 +0100 Subject: [PATCH 07/16] add if to cache --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7b4de05..965a244 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -92,6 +92,7 @@ jobs: ~/.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: @@ -100,6 +101,7 @@ jobs: ~/.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 From bf39d30d61bfa10131053b74970a70c6a71a8f39 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:11:25 +0100 Subject: [PATCH 08/16] fuck windows and mac os --- .github/workflows/rust.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 965a244..bbb2a1f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -53,9 +53,6 @@ jobs: fail-fast: false matrix: rust: - - name: MSRV - toolchain: stable - nightly: false - name: Stable toolchain: stable nightly: false @@ -66,6 +63,12 @@ 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: dtolnay/rust-toolchain@master From f5131937738243e85313de2dee75cac8b95c7967 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:16:30 +0100 Subject: [PATCH 09/16] Drop MSRV to 1.63 We could go lower but then we'd be at idna<1.0 and I believe that has some advisories ... --- Cargo.toml | 2 +- README.j2 | 4 +- README.md | 128 +++++++++++++++++++++++------------------------------ 3 files changed, 59 insertions(+), 75 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b7a30bb..790d21b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = ["influxdb", "influxdb_derive", "benches"] [workspace.package] authors = ["Gero Gerke <11deutron11@gmail.com>", "Dominic "] edition = "2018" -rust-version = "1.65" +rust-version = "1.63" license = "MIT" repository = "https://github.com/influxdb-rs/influxdb-rust" diff --git a/README.j2 b/README.j2 index ead28b4..adbc59d 100644 --- a/README.j2 +++ b/README.j2 @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.65 + + Minimum Rust Version: 1.63

diff --git a/README.md b/README.md index 9865904..330fc0c 100644 --- a/README.md +++ b/README.md @@ -25,40 +25,36 @@ Build with Rust - - Minimum Rust Version: 1.65 + + Minimum Rust Version: 1.63

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` 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` 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]: ggGkYW0BYXSEGyIMJPLf2ROkG1r7sBs89LDFG3LXR7q-ZFu2GzrbAmRaqoJqYXKEG1LaAVLASZMqG5J2qfpyCvbMG_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 From b09ef4e58a359340b0f601c1e380afd5bd814ec3 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:18:54 +0100 Subject: [PATCH 10/16] fix yaml indentation --- .github/workflows/rust.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index bbb2a1f..abac801 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -63,12 +63,12 @@ jobs: toolchain: nightly nightly: true os: [ubuntu-latest, windows-latest, macOS-latest] - include: - - rust: - name: MSRV - toolchain: stable - nightly: false - os: ubuntu-latest + include: + - rust: + name: MSRV + toolchain: stable + nightly: false + os: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master From e403a1c791ec90f5802df002d42e8293fce811cd Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:20:38 +0100 Subject: [PATCH 11/16] actually we need 1.64 for workspace inheritance --- Cargo.toml | 2 +- README.j2 | 4 ++-- README.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 790d21b..eb72eb0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = ["influxdb", "influxdb_derive", "benches"] [workspace.package] authors = ["Gero Gerke <11deutron11@gmail.com>", "Dominic "] edition = "2018" -rust-version = "1.63" +rust-version = "1.64" license = "MIT" repository = "https://github.com/influxdb-rs/influxdb-rust" diff --git a/README.j2 b/README.j2 index adbc59d..25cecd2 100644 --- a/README.j2 +++ b/README.j2 @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.63 + + Minimum Rust Version: 1.64

diff --git a/README.md b/README.md index 330fc0c..caf7ec9 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.63 + + Minimum Rust Version: 1.64

@@ -155,7 +155,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu @ 2020-2024 Gero Gerke, msrd0 and [contributors]. [contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors - [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEGyIMJPLf2ROkG1r7sBs89LDFG3LXR7q-ZFu2GzrbAmRaqoJqYXKEG1LaAVLASZMqG5J2qfpyCvbMG_Rohh5BobOmG0DqLv5454SZYWSBgmhpbmZsdXhkYmUwLjcuMg + [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG3PIdJyA0dNfG4kL-oKWKFz4Gw71yx7djCHzG0l_zrk6ftIQYXKEG1LaAVLASZMqG5J2qfpyCvbMG_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 From a66b7924d5123fdebc8c01a16a2f0cf56020972b Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:25:20 +0100 Subject: [PATCH 12/16] whatever 1.65 it is --- Cargo.toml | 2 +- README.j2 | 4 ++-- README.md | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index eb72eb0..b7a30bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ members = ["influxdb", "influxdb_derive", "benches"] [workspace.package] authors = ["Gero Gerke <11deutron11@gmail.com>", "Dominic "] edition = "2018" -rust-version = "1.64" +rust-version = "1.65" license = "MIT" repository = "https://github.com/influxdb-rs/influxdb-rust" diff --git a/README.j2 b/README.j2 index 25cecd2..ead28b4 100644 --- a/README.j2 +++ b/README.j2 @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.64 + + Minimum Rust Version: 1.65

diff --git a/README.md b/README.md index caf7ec9..f0b7a1c 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.64 + + Minimum Rust Version: 1.65

@@ -155,7 +155,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu @ 2020-2024 Gero Gerke, msrd0 and [contributors]. [contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors - [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG3PIdJyA0dNfG4kL-oKWKFz4Gw71yx7djCHzG0l_zrk6ftIQYXKEG1LaAVLASZMqG5J2qfpyCvbMG_Rohh5BobOmG0DqLv5454SZYWSBgmhpbmZsdXhkYmUwLjcuMg + [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEG_RDmlyxxvyrG0rwcLBKoYdvG5It9hbWNgjUGzjD8iBYfsFFYXKEG1LaAVLASZMqG5J2qfpyCvbMG_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 From 24f26f469ba1f36166c0170f93c9aa2dcc648e9e Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:30:19 +0100 Subject: [PATCH 13/16] auto-update the rust version in the readme --- Cargo.toml | 1 + README.j2 | 4 ++-- README.md | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b7a30bb..39c0853 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ members = ["influxdb", "influxdb_derive", "benches"] [workspace.package] authors = ["Gero Gerke <11deutron11@gmail.com>", "Dominic "] edition = "2018" +# always put fully qualified version here, e.g. 1.65.0 (**NOT** 1.65) rust-version = "1.65" license = "MIT" repository = "https://github.com/influxdb-rs/influxdb-rust" diff --git a/README.j2 b/README.j2 index ead28b4..cba6ed7 100644 --- a/README.j2 +++ b/README.j2 @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.65 + + Minimum Rust Version: {{ rust_version }}

diff --git a/README.md b/README.md index f0b7a1c..2dfecba 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ Build with Rust - - Minimum Rust Version: 1.65 + + Minimum Rust Version: 1.65.0

@@ -155,7 +155,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu @ 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]: ggGkYW0BYXSEGwiasFGzPvV5Gy6Y1oQPkGrqG7b_RpkdOEifG73obN0GCeV7YXKEG1LaAVLASZMqG5J2qfpyCvbMG_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 From 091351520dd07a0bd094c9317c9714c61e739e3b Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 24 Jan 2025 00:32:44 +0100 Subject: [PATCH 14/16] fix readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2dfecba..289ed65 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Build with Rust - Minimum Rust Version: 1.65.0 + Minimum Rust Version: 1.65.0

@@ -155,7 +155,7 @@ To communicate with InfluxDB, you can choose the HTTP backend to be used configu @ 2020-2024 Gero Gerke, msrd0 and [contributors]. [contributors]: https://github.com/influxdb-rs/influxdb-rust/graphs/contributors - [__cargo_doc2readme_dependencies_info]: ggGkYW0BYXSEGwiasFGzPvV5Gy6Y1oQPkGrqG7b_RpkdOEifG73obN0GCeV7YXKEG1LaAVLASZMqG5J2qfpyCvbMG_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 From 7177ae25ba4f972b639196dc3f0352dd8ab0aee2 Mon Sep 17 00:00:00 2001 From: Gero Gerke Date: Fri, 24 Jan 2025 17:21:05 +0100 Subject: [PATCH 15/16] chore: update e-mail --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 39c0853..c66c4af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["influxdb", "influxdb_derive", "benches"] [workspace.package] -authors = ["Gero Gerke <11deutron11@gmail.com>", "Dominic "] +authors = ["Gero Gerke ", "Dominic "] edition = "2018" # always put fully qualified version here, e.g. 1.65.0 (**NOT** 1.65) rust-version = "1.65" From 1e685d672167fca5dd1f6d1c38f61cf8464be479 Mon Sep 17 00:00:00 2001 From: Dominic Date: Fri, 4 Apr 2025 17:34:40 +0200 Subject: [PATCH 16/16] remove obviously misleading comment I assume I thought this was necessary for the readme generation, but turns out the readme looks just fine. --- Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c66c4af..d66f7d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ members = ["influxdb", "influxdb_derive", "benches"] [workspace.package] authors = ["Gero Gerke ", "Dominic "] edition = "2018" -# always put fully qualified version here, e.g. 1.65.0 (**NOT** 1.65) rust-version = "1.65" license = "MIT" repository = "https://github.com/influxdb-rs/influxdb-rust"