summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2022-01-05 04:30:48 -0500
committerJesse Luehrs <doy@tozt.net>2022-01-05 04:30:48 -0500
commitf127eb3b8fbc51c4d983e8595a29f71a6ae990e9 (patch)
treed77cf4d19813a8927f4bb6f0493b894e3589d0d0
parent49abd3faf21bf143378514ee356b5a78b554a0f3 (diff)
downloadnbsh-f127eb3b8fbc51c4d983e8595a29f71a6ae990e9.tar.gz
nbsh-f127eb3b8fbc51c4d983e8595a29f71a6ae990e9.zip
reorganize
-rw-r--r--src/main.rs1
-rw-r--r--src/pipeline/builtins/command.rs (renamed from src/builtins/command.rs)0
-rw-r--r--src/pipeline/builtins/mod.rs (renamed from src/builtins/mod.rs)0
-rw-r--r--src/pipeline/command.rs8
-rw-r--r--src/pipeline/mod.rs1
5 files changed, 5 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs
index 072e717..69fe1f0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,7 +12,6 @@
#![allow(clippy::too_many_lines)]
#![allow(clippy::type_complexity)]
-mod builtins;
mod env;
mod event;
mod format;
diff --git a/src/builtins/command.rs b/src/pipeline/builtins/command.rs
index b49b41d..b49b41d 100644
--- a/src/builtins/command.rs
+++ b/src/pipeline/builtins/command.rs
diff --git a/src/builtins/mod.rs b/src/pipeline/builtins/mod.rs
index f39d3ef..f39d3ef 100644
--- a/src/builtins/mod.rs
+++ b/src/pipeline/builtins/mod.rs
diff --git a/src/pipeline/command.rs b/src/pipeline/command.rs
index d21e095..271ce85 100644
--- a/src/pipeline/command.rs
+++ b/src/pipeline/command.rs
@@ -6,14 +6,14 @@ pub struct Command {
}
pub enum Inner {
Binary(async_std::process::Command),
- Builtin(crate::builtins::Command),
+ Builtin(super::builtins::Command),
}
impl Command {
pub fn new(exe: crate::parse::Exe) -> Self {
let exe_str = exe.exe().to_string();
Self {
- inner: crate::builtins::Command::new(exe).map_or_else(
+ inner: super::builtins::Command::new(exe).map_or_else(
|exe| Self::new_binary(exe).inner,
Inner::Builtin,
),
@@ -35,7 +35,7 @@ impl Command {
pub fn new_builtin(exe: crate::parse::Exe) -> Self {
let exe_str = exe.exe().to_string();
Self {
- inner: crate::builtins::Command::new(exe)
+ inner: super::builtins::Command::new(exe)
.map_or_else(|_| todo!(), Inner::Builtin),
exe: exe_str,
}
@@ -108,7 +108,7 @@ impl Command {
pub enum Child<'a> {
Binary(async_std::process::Child),
- Builtin(crate::builtins::Child<'a>),
+ Builtin(super::builtins::Child<'a>),
}
impl<'a> Child<'a> {
diff --git a/src/pipeline/mod.rs b/src/pipeline/mod.rs
index edb69e9..14f7074 100644
--- a/src/pipeline/mod.rs
+++ b/src/pipeline/mod.rs
@@ -12,6 +12,7 @@ pub enum Event {
Exit(crate::env::Env),
}
+mod builtins;
mod command;
pub use command::{Child, Command};