Skip to content

Commit 3a8ee1d

Browse files
tyranrontyranron
committed
Merge branch 'master' into arcstr
# Conflicts: # juniper/CHANGELOG.md # juniper/src/ast.rs # juniper/src/executor/mod.rs # juniper/src/schema/meta.rs # juniper/src/schema/model.rs # juniper/src/schema/schema.rs # juniper/src/validation/rules/overlapping_fields_can_be_merged.rs # juniper/src/validation/rules/variables_in_allowed_position.rs # juniper/src/validation/visitor.rs # juniper_hyper/src/lib.rs # juniper_subscriptions/CHANGELOG.md # tests/codegen/fail/interface/struct/attr_field_non_output_return_type.stderr # tests/codegen/fail/interface/struct/derive_field_non_output_return_type.stderr # tests/codegen/fail/interface/trait/field_non_output_return_type.stderr # tests/codegen/fail/object/attr_field_non_output_return_type.stderr # tests/codegen/fail/object/derive_field_non_output_return_type.stderr # tests/codegen/fail/subscription/field_non_output_return_type.stderr # tests/codegen/fail/union/enum_non_object_variant.stderr # tests/codegen/fail/union/struct_non_object_variant.stderr # tests/codegen/fail/union/trait_non_object_variant.stderr
2 parents 7f25665 + 8f69975 commit 3a8ee1d

File tree

281 files changed

+5317
-1898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

281 files changed

+5317
-1898
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ version: 2
22
updates:
33
- package-ecosystem: cargo
44
directory: /
5+
labels: ["enhancement", "rust", "k::dependencies"]
56
schedule:
67
interval: daily
78

89
- package-ecosystem: github-actions
910
directory: /
11+
labels: ["enhancement", "github_actions", "k::dependencies"]
1012
schedule:
1113
interval: daily
1214

1315
- package-ecosystem: npm
1416
directory: /juniper/
17+
labels: ["enhancement", "javascript", "k::dependencies", "k::integration"]
1518
schedule:
1619
interval: daily

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ jobs:
107107
- { feature: chrono-clock, crate: juniper }
108108
- { feature: chrono-tz, crate: juniper }
109109
- { feature: expose-test-schema, crate: juniper }
110+
- { feature: jiff, crate: juniper }
110111
- { feature: rust_decimal, crate: juniper }
111112
- { feature: schema-language, crate: juniper }
112113
- { feature: time, crate: juniper }
@@ -144,7 +145,7 @@ jobs:
144145
strategy:
145146
fail-fast: false
146147
matrix:
147-
msrv: ["1.73.0"]
148+
msrv: ["1.85.0"]
148149
crate:
149150
- juniper_codegen
150151
- juniper
@@ -172,10 +173,6 @@ jobs:
172173
- run: cargo +nightly update -Z minimal-versions
173174

174175
- run: make test.cargo crate=${{ matrix.crate }}
175-
if: ${{ matrix.crate != 'juniper_actix' }}
176-
# TODO: Remove once MSRV bumps up >=1.75.
177-
- run: cargo check -p ${{ matrix.crate }} --all-features
178-
if: ${{ matrix.crate == 'juniper_actix' }}
179176

180177
package:
181178
name: check (package)
@@ -273,9 +270,10 @@ jobs:
273270
matrix:
274271
crate:
275272
- juniper
273+
- juniper_axum
276274
target:
277275
- wasm32-unknown-unknown
278-
- wasm32-wasi
276+
- wasm32-wasip1
279277
toolchain:
280278
- stable
281279
- beta
@@ -288,10 +286,13 @@ jobs:
288286
toolchain: ${{ matrix.toolchain }}
289287
target: ${{ matrix.target }}
290288

289+
- name: Switch Cargo workspace to `resolver = "2"`
290+
run: sed -i 's/resolver = "1"/resolver = "2"/' Cargo.toml
291+
291292
- run: cargo check --target ${{ matrix.target }} -p ${{ matrix.crate }}
292-
${{ matrix.target == 'wasm32-unknown-unknown'
293-
&& '--features js'
294-
|| '' }}
293+
${{ (matrix.crate == 'juniper' && matrix.target == 'wasm32-unknown-unknown')
294+
&& '--features js'
295+
|| '' }}
295296

296297

297298

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
resolver = "1" # unifying Cargo features asap for Book tests
33
members = [
44
"benches",
5+
"book",
56
"juniper_codegen",
67
"juniper",
78
"juniper_hyper",

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 2-Clause License
22

3-
Copyright (c) 2016-2024 Magnus Hallin <[email protected]>,
3+
Copyright (c) 2016-2025 Magnus Hallin <[email protected]>,
44
Christoph Herzog <[email protected]>,
55
Christian Legnitto <[email protected]>,
66
Ilya Solovyiov <[email protected]>,

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ your Schemas automatically.
7373
- [url][url]
7474
- [chrono][chrono]
7575
- [chrono-tz][chrono-tz]
76+
- [jiff][jiff]
7677
- [time][time]
7778
- [bson][bson]
7879

@@ -119,6 +120,7 @@ Juniper has not reached 1.0 yet, thus some API instability should be expected.
119120
[url]: https://crates.io/crates/url
120121
[chrono]: https://crates.io/crates/chrono
121122
[chrono-tz]: https://crates.io/crates/chrono-tz
123+
[jiff]: https://crates.io/crates/jiff
122124
[time]: https://crates.io/crates/time
123125
[bson]: https://crates.io/crates/bson
124126
[juniper-from-schema]: https://github.com/davidpdrsn/juniper-from-schema

‎benches/Cargo.toml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
[package]
22
name = "juniper_benchmarks"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55
authors = ["Christoph Herzog <[email protected]>"]
66
publish = false
77

88
[dependencies]
9-
dataloader = "0.17" # for Book only
10-
futures = "0.3"
119
juniper = { path = "../juniper" }
1210

1311
[dev-dependencies]
1412
criterion = "0.5"
1513
tokio = { version = "1.0", features = ["rt-multi-thread"] }
1614

15+
[lints.clippy]
16+
allow_attributes = "warn"
17+
allow_attributes_without_reason = "warn"
18+
[lints.rust]
19+
closure_returning_async_block = "warn"
20+
future_incompatible = { level = "warn", priority = -1 }
21+
impl_trait_redundant_captures = "warn"
22+
non_ascii_idents = "forbid"
23+
unsafe_code = "forbid"
24+
unused_crate_dependencies = "warn"
25+
1726
[[bench]]
1827
name = "benchmark"
1928
harness = false

‎benches/benches/benchmark.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
1+
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
22

33
use juniper::InputValue;
44
use juniper_benchmarks as j;

‎benches/src/lib.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
#[cfg(test)]
2+
mod for_benches_only {
3+
use criterion as _;
4+
use tokio as _;
5+
}
6+
17
use juniper::{
2-
graphql_object, DefaultScalarValue, EmptyMutation, EmptySubscription, ExecutionError,
3-
FieldError, GraphQLEnum, GraphQLObject, RootNode, Value, Variables,
8+
DefaultScalarValue, EmptyMutation, EmptySubscription, ExecutionError, FieldError, GraphQLEnum,
9+
GraphQLObject, RootNode, Value, Variables, graphql_object,
410
};
511

612
pub type QueryResult = Result<

‎book/Cargo.toml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[package]
2+
name = "juniper_book"
3+
version = "0.0.0"
4+
edition = "2024"
5+
authors = ["Kai Ren <[email protected]>"]
6+
publish = false
7+
8+
[dependencies]
9+
dataloader = "0.18" # for Book only
10+
11+
[lints.clippy]
12+
allow_attributes = "warn"
13+
allow_attributes_without_reason = "warn"
14+
[lints.rust]
15+
closure_returning_async_block = "warn"
16+
future_incompatible = { level = "warn", priority = -1 }
17+
impl_trait_redundant_captures = "warn"
18+
non_ascii_idents = "forbid"
19+
unsafe_code = "forbid"
20+
unused_crate_dependencies = "warn"

‎book/book.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ create-missing = false
1616
git_repository_url = "https://github.com/graphql-rust/juniper"
1717

1818
[rust]
19-
edition = "2021"
19+
edition = "2024"

0 commit comments

Comments
 (0)