Add TermInner::new constructors

Author: ChrisDenton

src/term.rs

@@ -45,6 +45,25 @@ struct TermInner {
     prompt_guard: Mutex<()>,
 }
 
+impl TermInner {
+    fn new(target: TermTarget) -> Self {
+        Self::with_buffer(target, None)
+    }
+
+    fn new_buffered(target: TermTarget) -> Self {
+        Self::with_buffer(target, Some(vec![]))
+    }
+
+    fn with_buffer(target: TermTarget, buffer: Option<Vec<u8>>) -> Self {
+        Self {
+            target,
+            buffer: buffer.map(Mutex::new),
+            prompt: RwLock::new(String::new()),
+            prompt_guard: Mutex::new(()),
+        }
+    }
+}
+
 /// The family of the terminal.
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum TermFamily {
@@ -153,43 +172,23 @@ impl Term {
     /// Return a new unbuffered terminal.
     #[inline]
     pub fn stdout() -> Term {
-        Term::with_inner(TermInner {
-            target: TermTarget::Stdout,
-            buffer: None,
-            prompt: RwLock::new(String::new()),
-            prompt_guard: Mutex::new(()),
-        })
+        Term::with_inner(TermInner::new(TermTarget::Stdout))
     }
 
     /// Return a new unbuffered terminal to stderr.
     #[inline]
     pub fn stderr() -> Term {
-        Term::with_inner(TermInner {
-            target: TermTarget::Stderr,
-            buffer: None,
-            prompt: RwLock::new(String::new()),
-            prompt_guard: Mutex::new(()),
-        })
+        Term::with_inner(TermInner::new(TermTarget::Stderr))
     }
 
     /// Return a new buffered terminal.
     pub fn buffered_stdout() -> Term {
-        Term::with_inner(TermInner {
-            target: TermTarget::Stdout,
-            buffer: Some(Mutex::new(vec![])),
-            prompt: RwLock::new(String::new()),
-            prompt_guard: Mutex::new(()),
-        })
+        Term::with_inner(TermInner::new_buffered(TermTarget::Stdout))
     }
 
     /// Return a new buffered terminal to stderr.
     pub fn buffered_stderr() -> Term {
-        Term::with_inner(TermInner {
-            target: TermTarget::Stderr,
-            buffer: Some(Mutex::new(vec![])),
-            prompt: RwLock::new(String::new()),
-            prompt_guard: Mutex::new(()),
-        })
+        Term::with_inner(TermInner::new_buffered(TermTarget::Stderr))
     }
 
     /// Return a terminal for the given Read/Write pair styled like stderr.
@@ -209,16 +208,11 @@ impl Term {
         R: Read + Debug + AsRawFd + Send + 'static,
         W: Write + Debug + AsRawFd + Send + 'static,
     {
-        Term::with_inner(TermInner {
-            target: TermTarget::ReadWritePair(ReadWritePair {
-                read: Arc::new(Mutex::new(read)),
-                write: Arc::new(Mutex::new(write)),
-                style,
-            }),
-            buffer: None,
-            prompt: RwLock::new(String::new()),
-            prompt_guard: Mutex::new(()),
-        })
+        Term::with_inner(TermInner::new(TermTarget::ReadWritePair(ReadWritePair {
+            read: Arc::new(Mutex::new(read)),
+            write: Arc::new(Mutex::new(write)),
+            style,
+        })))
     }
 
     /// Return the style for this terminal.