Clean up import paths

Signed-off-by: Chris Frantz <cfrantz@google.com>

Author: cfrantz

examples/samples.rs

@@ -2,8 +2,7 @@
 use anyhow::{anyhow, Result};
 use clap::{ArgEnum, Parser};
 use serde::{Deserialize, Serialize};
-use serde_annotate::annotate::Annotate;
-use serde_annotate::{serialize, ColorProfile};
+use serde_annotate::{serialize, Annotate, ColorProfile};
 
 #[derive(Serialize, Deserialize, Annotate, Debug, PartialEq)]
 struct Coordinate {

src/annotate.rs

@@ -1,4 +1,3 @@
-pub use annotate_derive::*;
 use std::fmt;
 
 use crate::{AnnotatedSerializer, Document, Error};

src/lib.rs

@@ -1,4 +1,5 @@
 #![feature(min_specialization)]
+
 pub mod annotate;
 mod color;
 mod de;
@@ -12,6 +13,8 @@ mod relax;
 mod ser;
 mod yaml;
 
+pub use annotate::Annotate;
+pub use annotate_derive::*;
 pub use color::ColorProfile;
 pub use de::{from_str, Deserialize, Deserializer};
 pub use doc_iter::DocPath;

tests/test_erased.rs

@@ -1,7 +1,7 @@
 #![feature(min_specialization)]
 use anyhow::Result;
-use serde_annotate::annotate::Annotate;
 use serde_annotate::serialize;
+use serde_annotate::Annotate;
 
 #[derive(Debug, serde::Serialize, serde::Deserialize, Annotate)]
 struct Hello {

tests/test_format.rs

@@ -1,8 +1,8 @@
 #![feature(min_specialization)]
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
-use serde_annotate::annotate::Annotate;
 use serde_annotate::serialize;
+use serde_annotate::Annotate;
 
 fn fixdoc(doc: &str) -> String {
     let mut s = String::new();