upgrade dependencies

rkusa · Nov 15, 2023 · 4875b97 · 4875b97
1 parent 924f2d4
commit 4875b97
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 11 deletions.
diff --git a/postgres-macros/Cargo.toml b/postgres-macros/Cargo.toml
@@ -14,7 +14,7 @@ uuid = ["dep:uuid", "postgres/with-uuid-1"]
 
 [dependencies]
 ariadne = "0.3"
-chumsky = "1.0.0-alpha.4"
+chumsky = "1.0.0-alpha.6"
 dotenvy = "0.15"
 heck = "0.4"
 postgres = "0.19"

diff --git a/postgres-macros/src/parser.rs b/postgres-macros/src/parser.rs
@@ -40,9 +40,9 @@ fn token_parser<'a>() -> impl Parser<'a, &'a str, Token<'a>, extra::Err<Rich<'a,
         // escaped `}` (via `}}`)
         just("}}").map(|_| Token::EscapedCurlyEnd),
         // reject $ (accidental direct use of positional parameters)
-        just("$").validate(|text: &str, span, emitter| {
+        just("$").validate(|text: &str, e, emitter| {
             emitter.emit(Rich::custom(
-                span,
+                e.span(),
                 "use {} instead of $x for positional parameters",
             ));
             Token::Text(text)
@@ -51,7 +51,7 @@ fn token_parser<'a>() -> impl Parser<'a, &'a str, Token<'a>, extra::Err<Rich<'a,
         none_of("{}$")
             .repeated()
             .at_least(1)
-            .slice()
+            .to_slice()
             .map(Token::Text),
         // arguments: {}, {0}, {name}
         just("{")

diff --git a/postgres-macros/tests/fail-nightly/enum_extra_variant.stderr b/postgres-macros/tests/fail-nightly/enum_extra_variant.stderr
@@ -2,8 +2,9 @@ error[E0277]: the trait bound `Vec<User>: Query<Struct<(StructColumn<i64, "id">,
   --> tests/fail-nightly/enum_extra_variant.rs:26:59
    |
 26 |     let _: Vec<User> = sql!("SELECT id, role FROM users").await.unwrap();
-   |                                                          -^^^^^ the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>>` is not implemented for `Vec<User>`
-   |                                                          |
+   |                                                          -^^^^^
+   |                                                          ||
+   |                                                          |the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>>` is not implemented for `Vec<User>`
    |                                                          help: remove the `.await`
    |
    = help: the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"moderator">, EnumVariant<"user">)>, "role">)>>` is implemented for `Vec<User>`

diff --git a/postgres-macros/tests/fail-nightly/enum_missing_variant.stderr b/postgres-macros/tests/fail-nightly/enum_missing_variant.stderr
@@ -2,8 +2,9 @@ error[E0277]: the trait bound `Vec<User>: Query<Struct<(StructColumn<i64, "id">,
   --> tests/fail-nightly/enum_missing_variant.rs:20:59
    |
 20 |     let _: Vec<User> = sql!("SELECT id, role FROM users").await.unwrap();
-   |                                                          -^^^^^ the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>>` is not implemented for `Vec<User>`
-   |                                                          |
+   |                                                          -^^^^^
+   |                                                          ||
+   |                                                          |the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>>` is not implemented for `Vec<User>`
    |                                                          help: remove the `.await`
    |
    = help: the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"user">,)>, "role">)>>` is implemented for `Vec<User>`

diff --git a/postgres-macros/tests/fail-nightly/enum_variant_mismatch.stderr b/postgres-macros/tests/fail-nightly/enum_variant_mismatch.stderr
@@ -2,8 +2,9 @@ error[E0277]: the trait bound `Vec<User>: Query<Struct<(StructColumn<i64, "id">,
   --> tests/fail-nightly/enum_variant_mismatch.rs:23:59
    |
 23 |     let _: Vec<User> = sql!("SELECT id, role FROM users").await.unwrap();
-   |                                                          -^^^^^ the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>>` is not implemented for `Vec<User>`
-   |                                                          |
+   |                                                          -^^^^^
+   |                                                          ||
+   |                                                          |the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"admin">, EnumVariant<"user">)>, "role">)>>` is not implemented for `Vec<User>`
    |                                                          help: remove the `.await`
    |
    = help: the trait `Query<Struct<(StructColumn<i64, "id">, StructColumn<sqlm_postgres::types::Enum<(EnumVariant<"moderator">, EnumVariant<"user">)>, "role">)>>` is implemented for `Vec<User>`

diff --git a/postgres/Cargo.toml b/postgres/Cargo.toml
@@ -10,7 +10,7 @@ time = ["sqlm-postgres-macros/time", "tokio-postgres/with-time-0_3", "dep:time"]
 uuid = ["sqlm-postgres-macros/uuid", "tokio-postgres/with-uuid-1", "dep:uuid"]
 
 [dependencies]
-deadpool-postgres = "0.10"
+deadpool-postgres = "0.11"
 dotenvy = "0.15"
 http-error = { git = "https://github.com/rkusa/http-error.git", rev = "1f0630c" } # path = "../../http-error" }
 once_cell = "1.17"