From 02e62efe1581fbe531c899eedd638e9fae0283ea Mon Sep 17 00:00:00 2001 From: Jeff Date: Mon, 28 Aug 2023 14:28:59 -0400 Subject: [PATCH] Remove GUI from dust binary --- src/bin/dust.rs | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/bin/dust.rs b/src/bin/dust.rs index b5bc3f6..6b0b975 100644 --- a/src/bin/dust.rs +++ b/src/bin/dust.rs @@ -1,6 +1,5 @@ //! Command line interface for the whale programming language. use clap::Parser; -use eframe::{run_native, NativeOptions}; use nu_ansi_term::{Color, Style}; use reedline::{ default_emacs_keybindings, ColumnarMenu, Completer, DefaultHinter, DefaultPrompt, @@ -13,10 +12,7 @@ use std::{ path::PathBuf, }; -use dust_lib::{ - eval, eval_with_context, tools::gui::GuiApp, Result, Tool, ToolInfo, Value, VariableMap, - TOOL_LIST, -}; +use dust_lib::{eval, eval_with_context, Tool, ToolInfo, Value, VariableMap, TOOL_LIST}; /// Command-line arguments to be parsed. #[derive(Parser, Debug)] @@ -26,10 +22,6 @@ struct Args { #[arg(short, long)] command: Option, - // Whether to launch the dedicated GUI window. - #[arg(short, long)] - gui: bool, - /// Location of the file to run. path: Option, } @@ -37,7 +29,7 @@ struct Args { fn main() { let args = Args::parse(); - if !args.gui && args.path.is_none() && args.command.is_none() { + if args.path.is_none() && args.command.is_none() { return run_cli_shell(); } @@ -51,25 +43,12 @@ fn main() { Ok(Value::Empty) }; - if args.gui { - return run_gui_shell(eval_result); - } - match eval_result { Ok(value) => println!("{value}"), Err(error) => eprintln!("{error}"), } } -fn run_gui_shell(result: Result) { - run_native( - &Value::Empty.to_string(), - NativeOptions::default(), - Box::new(|_cc| Box::new(GuiApp::new(result))), - ) - .unwrap(); -} - fn run_cli_shell() { let mut context = VariableMap::new(); let mut line_editor = setup_reedline();