From 73740e6dd0723113e22a26aa389e545085f58857 Mon Sep 17 00:00:00 2001
From: Melody Horn <melody@boringcactus.com>
Date: Sat, 26 Mar 2022 20:13:37 -0600
Subject: refactor lib out of modules and test helper into a module

---
 src/schema_schema.rs | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/schema_schema.rs')

diff --git a/src/schema_schema.rs b/src/schema_schema.rs
index d548f5a..c7cc2ec 100644
--- a/src/schema_schema.rs
+++ b/src/schema_schema.rs
@@ -1,7 +1,5 @@
 use lazy_static::lazy_static;
 
-use super::node::validation::*;
-use super::node::*;
 use super::*;
 
 lazy_static! {
@@ -742,51 +740,51 @@ fn make_info_node() -> Node {
 
 fn make_schema_info() -> Info {
     Info {
-        title: vec![info::TextValue {
+        title: vec![TextValue {
             text: s("KDL Schema"),
             lang: s("en"),
         }],
-        description: vec![info::TextValue {
+        description: vec![TextValue {
             text: s("KDL Schema KDL schema in KDL"),
             lang: s("en"),
         }],
-        authors: vec![info::Person {
+        authors: vec![Person {
             name: s("Kat Marchán"),
             orcid: None,
-            links: vec![info::Link {
+            links: vec![Link {
                 iri: s("https://github.com/zkat"),
                 rel: s("self"),
                 lang: None,
             }],
         }],
-        contributors: vec![info::Person {
+        contributors: vec![Person {
             name: s("Lars Willighagen"),
             orcid: None,
-            links: vec![info::Link {
+            links: vec![Link {
                 iri: s("https://github.com/larsgw"),
                 rel: s("self"),
                 lang: None,
             }],
         }],
-        links: vec![info::Link {
+        links: vec![Link {
             iri: s("https://github.com/zkat/kdl"),
             rel: s("documentation"),
             lang: None,
         }],
-        licenses: vec![info::License {
+        licenses: vec![License {
             name: s("Creative Commons Attribution-ShareAlike 4.0 International License"),
             spdx: s("CC-BY-SA-4.0"),
-            link: vec![info::Link {
+            link: vec![Link {
                 iri: s("https://creativecommons.org/licenses/by-sa/4.0/"),
                 rel: None,
                 lang: s("en"),
             }],
         }],
-        published: Some(info::Date {
+        published: Some(Date {
             date: s("2021-08-31"),
             time: None,
         }),
-        modified: Some(info::Date {
+        modified: Some(Date {
             date: s("2021-09-01"),
             time: None,
         }),
-- 
cgit v1.2.3