From a3a17bf6e5eb93c1a30c5688d418cfed2556af46 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Wed, 19 Jun 2024 12:53:35 +0200
Subject: [PATCH] Make Clippy happy for 1.79 Rust
---
juniper/src/http/graphiql.rs | 14 ++++----------
juniper/src/types/scalars.rs | 2 +-
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/juniper/src/http/graphiql.rs b/juniper/src/http/graphiql.rs
index 803cf83a..63a7882a 100644
--- a/juniper/src/http/graphiql.rs
+++ b/juniper/src/http/graphiql.rs
@@ -12,25 +12,19 @@ pub fn graphiql_source(
graphql_endpoint_url: &str,
subscriptions_endpoint_url: Option<&str>,
) -> String {
- let subscriptions_endpoint = if let Some(sub_url) = subscriptions_endpoint_url {
- sub_url
- } else {
- ""
- };
-
include_str!("graphiql.html").replace(
"<!-- inject -->",
&format!(
// language=JavaScript
"
- var JUNIPER_URL = '{graphql_url}';
- var JUNIPER_SUBSCRIPTIONS_URL = '{graphql_subscriptions_url}';
+ var JUNIPER_URL = '{juniper_url}';
+ var JUNIPER_SUBSCRIPTIONS_URL = '{juniper_subscriptions_url}';
{grahiql_js}
",
- graphql_url = graphql_endpoint_url,
- graphql_subscriptions_url = subscriptions_endpoint,
+ juniper_url = graphql_endpoint_url,
+ juniper_subscriptions_url = subscriptions_endpoint_url.unwrap_or_default(),
grahiql_js = include_str!("graphiql.js"),
),
)
diff --git a/juniper/src/types/scalars.rs b/juniper/src/types/scalars.rs
index c904fcab..960b3aeb 100644
--- a/juniper/src/types/scalars.rs
+++ b/juniper/src/types/scalars.rs
@@ -1,4 +1,4 @@
-use std::{char, fmt, marker::PhantomData, ops::Deref, rc::Rc, thread::JoinHandle, u32};
+use std::{char, fmt, marker::PhantomData, ops::Deref, rc::Rc, thread::JoinHandle};
use serde::{Deserialize, Serialize};