Skip to content

Commit efefdee

Browse files
conradludgateconradludgate
committed
lints
1 parent a028f0c commit efefdee

File tree

11 files changed

+10
-66
lines changed

11 files changed

+10
-66
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
name: rustfmt
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v2
22+
- uses: actions/checkout@v4
2323
- uses: sfackler/actions/rustup@master
2424
- uses: sfackler/actions/rustfmt@master
2525

2626
clippy:
2727
name: clippy
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v4
3131
- uses: sfackler/actions/rustup@master
3232
- run: echo "::set-output name=version::$(rustc --version)"
3333
id: rust-version
@@ -47,13 +47,13 @@ jobs:
4747
with:
4848
path: target
4949
key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}y
50-
- run: cargo clippy --all --all-targets
50+
- run: cargo clippy --workspace --all-targets
5151

5252
test:
5353
name: test
5454
runs-on: ubuntu-latest
5555
steps:
56-
- uses: actions/checkout@v2
56+
- uses: actions/checkout@v4
5757
- run: docker compose up -d
5858
- uses: sfackler/actions/rustup@master
5959
with:

‎postgres-protocol/src/types/test.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ fn ltree_str() {
174174
let mut query = vec![1u8];
175175
query.extend_from_slice("A.B.C".as_bytes());
176176

177-
assert!(matches!(ltree_from_sql(query.as_slice()), Ok(_)))
177+
assert!(ltree_from_sql(query.as_slice()).is_ok())
178178
}
179179

180180
#[test]
181181
fn ltree_wrong_version() {
182182
let mut query = vec![2u8];
183183
query.extend_from_slice("A.B.C".as_bytes());
184184

185-
assert!(matches!(ltree_from_sql(query.as_slice()), Err(_)))
185+
assert!(ltree_from_sql(query.as_slice()).is_err())
186186
}
187187

188188
#[test]
@@ -202,15 +202,15 @@ fn lquery_str() {
202202
let mut query = vec![1u8];
203203
query.extend_from_slice("A.B.C".as_bytes());
204204

205-
assert!(matches!(lquery_from_sql(query.as_slice()), Ok(_)))
205+
assert!(lquery_from_sql(query.as_slice()).is_ok())
206206
}
207207

208208
#[test]
209209
fn lquery_wrong_version() {
210210
let mut query = vec![2u8];
211211
query.extend_from_slice("A.B.C".as_bytes());
212212

213-
assert!(matches!(lquery_from_sql(query.as_slice()), Err(_)))
213+
assert!(lquery_from_sql(query.as_slice()).is_err())
214214
}
215215

216216
#[test]
@@ -230,13 +230,13 @@ fn ltxtquery_str() {
230230
let mut query = vec![1u8];
231231
query.extend_from_slice("a & b*".as_bytes());
232232

233-
assert!(matches!(ltree_from_sql(query.as_slice()), Ok(_)))
233+
assert!(ltree_from_sql(query.as_slice()).is_ok())
234234
}
235235

236236
#[test]
237237
fn ltxtquery_wrong_version() {
238238
let mut query = vec![2u8];
239239
query.extend_from_slice("a & b*".as_bytes());
240240

241-
assert!(matches!(ltree_from_sql(query.as_slice()), Err(_)))
241+
assert!(ltree_from_sql(query.as_slice()).is_err())
242242
}

‎postgres-types/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ array-impls = ["array-init"]
1616
with-bit-vec-0_6 = ["bit-vec-06"]
1717
with-cidr-0_2 = ["cidr-02"]
1818
with-chrono-0_4 = ["chrono-04"]
19-
with-eui48-0_4 = ["eui48-04"]
2019
with-eui48-1 = ["eui48-1"]
2120
with-geo-types-0_6 = ["geo-types-06"]
2221
with-geo-types-0_7 = ["geo-types-0_7"]
@@ -39,7 +38,6 @@ chrono-04 = { version = "0.4.16", package = "chrono", default-features = false,
3938
"clock",
4039
], optional = true }
4140
cidr-02 = { version = "0.2", package = "cidr", optional = true }
42-
eui48-04 = { version = "0.4", package = "eui48", optional = true }
4341
eui48-1 = { version = "1.0", package = "eui48", optional = true }
4442
geo-types-06 = { version = "0.6", package = "geo-types", optional = true }
4543
geo-types-0_7 = { version = "0.7", package = "geo-types", optional = true }

‎postgres-types/src/eui48_04.rs

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎postgres-types/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,6 @@ mod bit_vec_06;
214214
mod chrono_04;
215215
#[cfg(feature = "with-cidr-0_2")]
216216
mod cidr_02;
217-
#[cfg(feature = "with-eui48-0_4")]
218-
mod eui48_04;
219217
#[cfg(feature = "with-eui48-1")]
220218
mod eui48_1;
221219
#[cfg(feature = "with-geo-types-0_6")]

‎postgres/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ circle-ci = { repository = "sfackler/rust-postgres" }
2424
array-impls = ["tokio-postgres/array-impls"]
2525
with-bit-vec-0_6 = ["tokio-postgres/with-bit-vec-0_6"]
2626
with-chrono-0_4 = ["tokio-postgres/with-chrono-0_4"]
27-
with-eui48-0_4 = ["tokio-postgres/with-eui48-0_4"]
2827
with-eui48-1 = ["tokio-postgres/with-eui48-1"]
2928
with-geo-types-0_6 = ["tokio-postgres/with-geo-types-0_6"]
3029
with-geo-types-0_7 = ["tokio-postgres/with-geo-types-0_7"]

‎postgres/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
//! | ------- | ----------- | ------------------ | ------- |
5656
//! | `with-bit-vec-0_6` | Enable support for the `bit-vec` crate. | [bit-vec](https://crates.io/crates/bit-vec) 0.6 | no |
5757
//! | `with-chrono-0_4` | Enable support for the `chrono` crate. | [chrono](https://crates.io/crates/chrono) 0.4 | no |
58-
//! | `with-eui48-0_4` | Enable support for the 0.4 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
5958
//! | `with-eui48-1` | Enable support for the 1.0 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 1.0 | no |
6059
//! | `with-geo-types-0_6` | Enable support for the 0.6 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.6.0) 0.6 | no |
6160
//! | `with-geo-types-0_7` | Enable support for the 0.7 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.7.0) 0.7 | no |

‎tokio-postgres/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ runtime = ["tokio/net", "tokio/time"]
3030
array-impls = ["postgres-types/array-impls"]
3131
with-bit-vec-0_6 = ["postgres-types/with-bit-vec-0_6"]
3232
with-chrono-0_4 = ["postgres-types/with-chrono-0_4"]
33-
with-eui48-0_4 = ["postgres-types/with-eui48-0_4"]
3433
with-eui48-1 = ["postgres-types/with-eui48-1"]
3534
with-geo-types-0_6 = ["postgres-types/with-geo-types-0_6"]
3635
with-geo-types-0_7 = ["postgres-types/with-geo-types-0_7"]
@@ -73,7 +72,6 @@ tokio = { version = "1.0", features = [
7372

7473
bit-vec-06 = { version = "0.6", package = "bit-vec" }
7574
chrono-04 = { version = "0.4", package = "chrono", default-features = false }
76-
eui48-04 = { version = "0.4", package = "eui48" }
7775
eui48-1 = { version = "1.0", package = "eui48" }
7876
geo-types-06 = { version = "0.6", package = "geo-types" }
7977
geo-types-07 = { version = "0.7", package = "geo-types" }

‎tokio-postgres/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@
107107
//! | `array-impls` | Enables `ToSql` and `FromSql` trait impls for arrays | - | no |
108108
//! | `with-bit-vec-0_6` | Enable support for the `bit-vec` crate. | [bit-vec](https://crates.io/crates/bit-vec) 0.6 | no |
109109
//! | `with-chrono-0_4` | Enable support for the `chrono` crate. | [chrono](https://crates.io/crates/chrono) 0.4 | no |
110-
//! | `with-eui48-0_4` | Enable support for the 0.4 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 0.4 | no |
111110
//! | `with-eui48-1` | Enable support for the 1.0 version of the `eui48` crate. | [eui48](https://crates.io/crates/eui48) 1.0 | no |
112111
//! | `with-geo-types-0_6` | Enable support for the 0.6 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.6.0) 0.6 | no |
113112
//! | `with-geo-types-0_7` | Enable support for the 0.7 version of the `geo-types` crate. | [geo-types](https://crates.io/crates/geo-types/0.7.0) 0.7 | no |

‎tokio-postgres/tests/test/types/eui48_04.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)