From 96e423ff31701a782560ac25a940b6467c0adea0 Mon Sep 17 00:00:00 2001 From: Sunli Date: Fri, 6 May 2022 09:28:57 +0800 Subject: [PATCH] Fixes #911 --- src/registry/mod.rs | 6 +++--- src/validation/utils.rs | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/registry/mod.rs b/src/registry/mod.rs index 837ba533..5174f1ff 100644 --- a/src/registry/mod.rs +++ b/src/registry/mod.rs @@ -33,8 +33,8 @@ pub enum MetaTypeName<'a> { Named(&'a str), } -impl<'a> std::fmt::Display for MetaTypeName<'a> { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { +impl<'a> Display for MetaTypeName<'a> { + fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { match self { MetaTypeName::Named(name) => write!(f, "{}", name), MetaTypeName::NonNull(name) => write!(f, "{}!", name), @@ -388,7 +388,7 @@ impl MetaType { pub struct MetaDirective { pub name: &'static str, pub description: Option<&'static str>, - pub locations: Vec, + pub locations: Vec<__DirectiveLocation>, pub args: IndexMap, pub is_repeatable: bool, pub visible: Option, diff --git a/src/validation/utils.rs b/src/validation/utils.rs index 68453e0f..8a3804e3 100644 --- a/src/validation/utils.rs +++ b/src/validation/utils.rs @@ -69,7 +69,11 @@ pub fn is_valid_input_value( return None; } - match registry.types.get(type_name).unwrap() { + match registry + .types + .get(type_name) + .unwrap_or_else(|| panic!("Type `{}` not defined", type_name)) + { registry::MetaType::Scalar { is_valid, .. } => { if is_valid(&value) { None