Move Reader::from_str() constructor alongside Reader::from_reader()

Author: dralley

src/reader/mod.rs

@@ -4,7 +4,7 @@ use std::io::Read;
 use std::ops::Range;
 
 #[cfg(feature = "encoding")]
-use encoding_rs::Encoding;
+use encoding_rs::{Encoding, UTF_8};
 
 use crate::encoding::{Decoder, Utf8BytesReader};
 use crate::errors::{Error, Result};
@@ -471,6 +471,31 @@ impl<R: Read> Reader<Utf8BytesReader<R>> {
     }
 }
 
+/// Builder methods
+impl<'a> Reader<&'a [u8]> {
+    /// Creates an XML reader from a string slice.
+    pub fn from_str(s: &'a str) -> Self {
+        // Rust strings are guaranteed to be UTF-8, so lock the encoding
+        #[cfg(feature = "encoding")]
+        {
+            let mut parser = Parser::default();
+            parser.encoding = EncodingRef::Explicit(UTF_8);
+            Self {
+                reader: s.as_bytes(),
+                parser: parser,
+            }
+        }
+
+        #[cfg(not(feature = "encoding"))]
+        {
+            Self {
+                reader: s.as_bytes(),
+                parser: Parser::default(),
+            }
+        }
+    }
+}
+
 /// Public implementation-independent functionality
 impl<R> Reader<R> {
     // Configuration setters

src/reader/slice_reader.rs

@@ -5,9 +5,7 @@
 use std::borrow::Cow;
 
 #[cfg(feature = "encoding")]
-use crate::reader::EncodingRef;
-#[cfg(feature = "encoding")]
-use encoding_rs::{Encoding, UTF_8};
+use encoding_rs::Encoding;
 
 use crate::errors::{Error, Result};
 use crate::events::Event;
@@ -16,34 +14,10 @@ use crate::reader::{is_whitespace, BangType, ReadElementState, Reader, Span, Xml
 
 use memchr;
 
-use super::parser::Parser;
-
 /// This is an implementation of [`Reader`] for reading from a `&[u8]` as
 /// underlying byte stream. This implementation supports not using an
 /// intermediate buffer as the byte slice itself can be used to borrow from.
 impl<'a> Reader<&'a [u8]> {
-    /// Creates an XML reader from a string slice.
-    pub fn from_str(s: &'a str) -> Self {
-        // Rust strings are guaranteed to be UTF-8, so lock the encoding
-        #[cfg(feature = "encoding")]
-        {
-            let mut parser = Parser::default();
-            parser.encoding = EncodingRef::Explicit(UTF_8);
-            Self {
-                reader: s.as_bytes(),
-                parser: parser,
-            }
-        }
-
-        #[cfg(not(feature = "encoding"))]
-        {
-            Self {
-                reader: s.as_bytes(),
-                parser: Parser::default(),
-            }
-        }
-    }
-
     /// Read an event that borrows from the input rather than a buffer.
     ///
     /// There is no asynchronous `read_event_async()` version of this function,