Skip to content

Commit 208b9ff

Browse files
committed
(chore): reverting the toolchain update because the macro error outputs changed between the 2 editions
1 parent 0ad819f commit 208b9ff

10 files changed

Lines changed: 31 additions & 31 deletions

lambda-appsync-proc/tests/fail/invalid_log_init_ret.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0271]: expected `custom_log_init` to return `()`, but it returns `&str`
1+
error[E0271]: expected `custom_log_init` to be a fn item that returns `()`, but it returns `&str`
22
--> tests/fail/invalid_log_init_ret.rs:7:67
33
|
44
7 | appsync_lambda_main!("../../../../schema.graphql", log_init = custom_log_init);

lambda-appsync-proc/tests/fail/invalid_operation.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ help: consider importing one of these modules
1414
|
1515
1 + use crate::__operations::queries::game_status::without_event;
1616
|
17-
= and 5 other candidates
17+
and 5 other candidates

lambda-appsync-proc/tests/fail/invalid_return_type.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0271]: expected `wrong_return_type` to return `Result<Vec<Player>, AppsyncError>`, but it returns `Result<String, AppsyncError>`
1+
error[E0271]: expected `wrong_return_type` to be a fn item that returns `Result<Vec<Player>, AppsyncError>`, but it returns `Result<String, AppsyncError>`
22
--> tests/fail/invalid_return_type.rs:7:10
33
|
44
6 | #[appsync_operation(query(players))]

lambda-appsync-proc/tests/fail/invalid_type_field_override.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0425]: cannot find type `NonExistentType` in this scope
1+
error[E0412]: cannot find type `NonExistentType` in this scope
22
--> tests/fail/invalid_type_field_override.rs:7:32
33
|
44
7 | type_override = Player.id: NonExistentType,

lambda-appsync-proc/tests/fail/invalid_type_operation_arg_override.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0425]: cannot find type `BadId` in this scope
1+
error[E0412]: cannot find type `BadId` in this scope
22
--> tests/fail/invalid_type_operation_arg_override.rs:7:38
33
|
44
7 | type_override = Query.player.id: BadId,
Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
error[E0425]: cannot find type `InvalidStatus` in this scope
1+
error[E0412]: cannot find type `InvalidStatus` in this scope
22
--> tests/fail/invalid_type_operation_override.rs:7:39
33
|
44
7 | type_override = Query.gameStatus: InvalidStatus,
55
| ^^^^^^^^^^^^^ not found in this scope
6-
7-
error[E0282]: type annotations needed
8-
--> tests/fail/invalid_type_operation_override.rs:3:1
9-
|
10-
3 | / appsync_lambda_main!(
11-
4 | | "../../../../schema.graphql",
12-
5 | | exclude_lambda_handler = true,
13-
... |
14-
8 | | );
15-
| |_^ cannot infer type
16-
|
17-
= note: this error originates in the macro `appsync_lambda_main` (in Nightly builds, run with -Z macro-backtrace for more info)

lambda-appsync-proc/tests/fail/missing_arg.stderr

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ error[E0308]: mismatched types
22
--> tests/fail/missing_arg.rs:6:1
33
|
44
6 | #[appsync_operation(mutation(createPlayer))]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `(String,)`, found `()`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
| |
7+
| expected `(String,)`, found `()`
8+
| this expression has type `(std::string::String,)`
69
|
710
= note: expected tuple `(std::string::String,)`
811
found unit type `()`

lambda-appsync-proc/tests/fail/missing_arg_with_event.stderr

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ error[E0308]: mismatched types
22
--> tests/fail/missing_arg_with_event.rs:26:1
33
|
44
26 | #[appsync_operation(query(player), with_appsync_event)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 1 element
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
| |
7+
| expected a tuple with 2 elements, found one with 1 element
8+
| this expression has type `(ID, &AppsyncEvent<Operation>)`
69
|
710
= note: expected tuple `(ID, &AppsyncEvent<Operation>)`
811
found tuple `(_,)`
@@ -12,7 +15,10 @@ error[E0308]: mismatched types
1215
--> tests/fail/missing_arg_with_event.rs:6:1
1316
|
1417
6 | #[appsync_operation(mutation(createPlayer), with_appsync_event)]
15-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `(String, &AppsyncEvent<Operation>)`, found `()`
18+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
19+
| |
20+
| expected `(String, &AppsyncEvent<Operation>)`, found `()`
21+
| this expression has type `(std::string::String, &AppsyncEvent<Operation>)`
1622
|
1723
= note: expected tuple `(std::string::String, &AppsyncEvent<Operation>)`
1824
found unit type `()`
@@ -22,7 +28,10 @@ error[E0308]: mismatched types
2228
--> tests/fail/missing_arg_with_event.rs:16:1
2329
|
2430
16 | #[appsync_operation(mutation(deletePlayer), with_appsync_event)]
25-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected a tuple with 2 elements, found one with 1 element
31+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
32+
| |
33+
| expected a tuple with 2 elements, found one with 1 element
34+
| this expression has type `(ID, &AppsyncEvent<Operation>)`
2635
|
2736
= note: expected tuple `(ID, &AppsyncEvent<Operation>)`
2837
found tuple `(_,)`
@@ -60,7 +69,7 @@ error[E0593]: function is expected to take 2 arguments, but it takes 1 argument
6069
note: required by a bound in `delete_player::with_event::check_signature`
6170
--> tests/fail/missing_arg_with_event.rs:3:1
6271
|
63-
3 | appsync_lambda_main!("../../../../schema.graphql");
72+
3 | appsync_lambda_main!("../../../../schema.graphql");
6473
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check_signature`
6574
= note: this error originates in the macro `appsync_lambda_main` (in Nightly builds, run with -Z macro-backtrace for more info)
6675

@@ -78,6 +87,6 @@ error[E0593]: function is expected to take 2 arguments, but it takes 1 argument
7887
note: required by a bound in `player::with_event::check_signature`
7988
--> tests/fail/missing_arg_with_event.rs:3:1
8089
|
81-
3 | appsync_lambda_main!("../../../../schema.graphql");
90+
3 | appsync_lambda_main!("../../../../schema.graphql");
8291
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `check_signature`
8392
= note: this error originates in the macro `appsync_lambda_main` (in Nightly builds, run with -Z macro-backtrace for more info)

nix/flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nix/rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.94.1"
2+
channel = "1.82"
33
profile = "default"

0 commit comments

Comments
 (0)