diff --git a/Cargo.lock b/Cargo.lock index 091b2f548c2..d39bb3daa56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -145,12 +145,6 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - [[package]] name = "ascii_utils" version = "0.9.3" @@ -743,19 +737,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - [[package]] name = "combine" version = "4.6.7" @@ -2351,11 +2332,11 @@ dependencies = [ [[package]] name = "graphql-parser" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" +checksum = "7a818c0d883d7c0801df27be910917750932be279c7bc82dc541b8769425f409" dependencies = [ - "combine 3.8.1", + "combine", "thiserror 1.0.61", ] @@ -4417,7 +4398,7 @@ dependencies = [ "backon", "bytes", "cfg-if 1.0.0", - "combine 4.6.7", + "combine", "futures-channel", "futures-util", "itoa", @@ -6214,15 +6195,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -6301,12 +6273,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "walkdir" version = "2.5.0" diff --git a/graph/Cargo.toml b/graph/Cargo.toml index 10a6446f876..d3c934d99c0 100644 --- a/graph/Cargo.toml +++ b/graph/Cargo.toml @@ -36,7 +36,7 @@ http-body-util = "0.1" hyper-util = { version = "0.1", features = ["full"] } futures01 = { package = "futures", version = "0.1.31" } lru_time_cache = "0.11" -graphql-parser = "0.4.0" +graphql-parser = "0.4.1" humantime = "2.3.0" lazy_static = "1.5.0" num-bigint = { version = "=0.2.6", features = ["serde"] } diff --git a/server/http/tests/server.rs b/server/http/tests/server.rs index 3ad78138437..08d5a41f363 100644 --- a/server/http/tests/server.rs +++ b/server/http/tests/server.rs @@ -227,9 +227,7 @@ mod test { assert_eq!( message, - "Unexpected `unexpected character \ - \'<\'`\nExpected `{`, `query`, `mutation`, \ - `subscription` or `fragment`" + "Unexpected unexpected character '<'\nUnexpected end of input\nExpected {, query, mutation, subscription or fragment" ); let locations = errors[0] diff --git a/store/postgres/Cargo.toml b/store/postgres/Cargo.toml index 12502c2cb42..392a5a1c3de 100644 --- a/store/postgres/Cargo.toml +++ b/store/postgres/Cargo.toml @@ -35,4 +35,4 @@ pretty_assertions = "1.4.1" [dev-dependencies] clap.workspace = true -graphql-parser = "0.4.0" +graphql-parser = "0.4.1" diff --git a/store/test-store/tests/graphql/introspection.rs b/store/test-store/tests/graphql/introspection.rs index 8bc76213e6b..4358621b2dc 100644 --- a/store/test-store/tests/graphql/introspection.rs +++ b/store/test-store/tests/graphql/introspection.rs @@ -617,6 +617,7 @@ async fn satisfies_graphiql_introspection_query_with_fragments() { // needs to be regenerated, uncomment this line, and save the output in // mock_introspection.json // + // println!("{}", graph::prelude::serde_json::to_string(&data).unwrap()); assert!(same_value(&data, &expected_mock_schema_introspection())); } diff --git a/store/test-store/tests/graphql/mock_introspection.json b/store/test-store/tests/graphql/mock_introspection.json index 9ebb47acb5d..d2eca61b928 100644 --- a/store/test-store/tests/graphql/mock_introspection.json +++ b/store/test-store/tests/graphql/mock_introspection.json @@ -158,7 +158,7 @@ { "kind": "SCALAR", "name": "Int", - "description": "4 bytes signed integer\n", + "description": "4 bytes signed integer", "fields": null, "inputFields": null, "interfaces": null, @@ -168,7 +168,7 @@ { "kind": "SCALAR", "name": "Int8", - "description": "8 bytes signed integer\n", + "description": "8 bytes signed integer", "fields": null, "inputFields": null, "interfaces": null, @@ -763,7 +763,7 @@ { "kind": "SCALAR", "name": "Timestamp", - "description": "A string representation of microseconds UNIX timestamp (16 digits)\n", + "description": "A string representation of microseconds UNIX timestamp (16 digits)", "fields": null, "inputFields": null, "interfaces": null, @@ -1351,7 +1351,7 @@ "fields": [ { "name": "block", - "description": "Information about a specific subgraph block. The hash of the block\nwill be null if the _meta field has a block constraint that asks for\na block number. It will be filled if the _meta field has no block constraint\nand therefore asks for the latest block\n", + "description": "Information about a specific subgraph block. The hash of the block\nwill be null if the _meta field has a block constraint that asks for\na block number. It will be filled if the _meta field has no block constraint\nand therefore asks for the latest block", "args": [], "type": { "kind": "NON_NULL",