Skip to content

Commit 86b5319

Browse files
committed
Fix unit tests for latest nightly
1 parent 847a38a commit 86b5319

File tree

8 files changed

+32
-27
lines changed

8 files changed

+32
-27
lines changed

Diff for: juniper/src/parser/lexer.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
use std::{
2-
char, fmt,
3-
iter::{Iterator, Peekable},
4-
result::Result,
5-
str::CharIndices,
6-
};
1+
use std::{char, fmt, iter::Peekable, str::CharIndices};
72

83
use crate::parser::{SourcePosition, Spanning};
94

Diff for: juniper/src/parser/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{error::Error, fmt, result::Result};
1+
use std::{error::Error, fmt};
22

33
use smartstring::alias::String;
44

Diff for: juniper/src/schema/meta.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
//! Types used to describe a `GraphQL` schema
22
33
use juniper::IntoFieldError;
4-
use std::{
5-
borrow::{Cow, ToOwned},
6-
fmt,
7-
};
4+
use std::{borrow::Cow, fmt};
85

96
use crate::{
107
ast::{FromInputValue, InputValue, Type},

Diff for: juniper/src/types/scalars.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
use std::{
2-
char, convert::From, fmt, marker::PhantomData, ops::Deref, rc::Rc, thread::JoinHandle, u32,
3-
};
1+
use std::{char, fmt, marker::PhantomData, ops::Deref, rc::Rc, thread::JoinHandle, u32};
42

53
use serde::{Deserialize, Serialize};
64

Diff for: juniper/src/types/utilities.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{collections::HashSet, iter::Iterator};
1+
use std::collections::HashSet;
22

33
use crate::{
44
ast::InputValue,

Diff for: juniper_graphql_ws/src/graphql_transport_ws/mod.rs

+9-4
Original file line numberDiff line numberDiff line change
@@ -611,16 +611,21 @@ where
611611

612612
#[cfg(test)]
613613
mod test {
614-
use std::{convert::Infallible, io};
614+
use std::{convert::Infallible, io, sync::Arc, time::Duration};
615615

616616
use juniper::{
617-
futures::sink::SinkExt,
617+
futures::{
618+
future::{self, FutureExt as _},
619+
sink::SinkExt,
620+
stream::{self, BoxStream, StreamExt as _},
621+
},
618622
graphql_input_value, graphql_object, graphql_subscription, graphql_value, graphql_vars,
619623
parser::{ParseError, Spanning},
620-
DefaultScalarValue, EmptyMutation, FieldError, FieldResult, RootNode, Variables,
624+
DefaultScalarValue, EmptyMutation, FieldError, FieldResult, GraphQLError, RootNode,
625+
Variables,
621626
};
622627

623-
use super::*;
628+
use super::{Connection, ConnectionConfig, NextPayload, Output, SubscribePayload};
624629

625630
struct Context(i32);
626631

Diff for: juniper_graphql_ws/src/graphql_ws/mod.rs

+11-6
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ use std::{
2323
use juniper::{
2424
futures::{
2525
channel::oneshot,
26-
future::{self, BoxFuture, Either, Future, FutureExt, TryFutureExt},
27-
stream::{self, BoxStream, SelectAll, StreamExt},
26+
future::{self, BoxFuture, Either, Future, FutureExt as _, TryFutureExt as _},
27+
stream::{self, BoxStream, SelectAll, StreamExt as _},
2828
task::{Context, Poll, Waker},
2929
Sink, Stream,
3030
},
@@ -547,16 +547,21 @@ where
547547

548548
#[cfg(test)]
549549
mod test {
550-
use std::{convert::Infallible, io};
550+
use std::{convert::Infallible, io, sync::Arc, time::Duration};
551551

552552
use juniper::{
553-
futures::sink::SinkExt,
553+
futures::{
554+
future::{self, FutureExt as _},
555+
sink::SinkExt,
556+
stream::{self, BoxStream, StreamExt as _},
557+
},
554558
graphql_input_value, graphql_object, graphql_subscription, graphql_value, graphql_vars,
555559
parser::{ParseError, Spanning},
556-
DefaultScalarValue, EmptyMutation, FieldError, FieldResult, RootNode, Variables,
560+
DefaultScalarValue, EmptyMutation, FieldError, FieldResult, GraphQLError, RootNode,
561+
Variables,
557562
};
558563

559-
use super::*;
564+
use super::{Connection, ConnectionConfig, ConnectionErrorPayload, DataPayload, StartPayload};
560565

561566
struct Context(i32);
562567

Diff for: juniper_subscriptions/src/lib.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,15 @@ where
242242

243243
#[cfg(test)]
244244
mod whole_responses_stream {
245+
use std::task::Poll;
246+
245247
use futures::{stream, StreamExt as _};
246-
use juniper::{graphql_value, DefaultScalarValue, ExecutionError, FieldError};
248+
use juniper::{
249+
graphql_value, DefaultScalarValue, ExecutionError, ExecutionOutput, FieldError, Object,
250+
Value, ValuesStream,
251+
};
247252

248-
use super::*;
253+
use super::whole_responses_stream;
249254

250255
#[tokio::test]
251256
async fn with_error() {

0 commit comments

Comments
 (0)