Skip to content
This repository has been archived by the owner on Aug 3, 2023. It is now read-only.

Better error printing #327

Merged
merged 7 commits into from
Jul 22, 2019
Merged

Better error printing #327

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
871e2d1
Use semantically correct warn emoji, and use Display instead of Debug…
xortive Jul 17, 2019
d7c5971
use stderr, exit with failure code
xortive Jul 17, 2019
e8195e8
cargo fmt
xortive Jul 17, 2019
3a66a41
use exitfailure instead
xortive Jul 17, 2019
4efd583
Merge branch 'master' into malonso/feat-better-error-printing
xortive Jul 18, 2019
0ebbec1
Update src/terminal/emoji.rs
xortive Jul 22, 2019
431fdaa
Merge branch 'master' into malonso/feat-better-error-printing
xortive Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ number_prefix = "0.3.0"
flate2 = "1.0.7"
base64 = "0.10.1"
lazy_static = "1.3.0"
exitfailure = "0.5.1"

[dev-dependencies]
assert_cmd = "0.11.1"
Expand Down
6 changes: 5 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ mod settings;
mod terminal;

use crate::settings::project::ProjectType;
use exitfailure::ExitFailure;
use terminal::emoji;

fn main() -> Result<(), failure::Error> {
fn main() -> Result<(), ExitFailure> {
env_logger::init();
if let Ok(me) = env::current_exe() {
// If we're actually running as the installer then execute our
Expand All @@ -32,7 +33,10 @@ fn main() -> Result<(), failure::Error> {
installer::install();
}
}
Ok(run()?)
}

fn run() -> Result<(), failure::Error> {
let matches = App::new(format!("{}{} wrangler", emoji::WORKER, emoji::SPARKLES))
.version(env!("CARGO_PKG_VERSION"))
.author("ashley g williams <[email protected]>")
Expand Down
2 changes: 1 addition & 1 deletion src/terminal/emoji.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ pub static SLEUTH: Emoji = Emoji("🕵️‍♂️", "");
pub static SPARKLES: Emoji = Emoji("✨ ", "");
pub static SWIRL: Emoji = Emoji("🌀 ", "");
pub static UP: Emoji = Emoji("🆙 ", "");
pub static WARN: Emoji = Emoji("⛔ ", "");
pub static WARN: Emoji = Emoji("⚠️", "");
xortive marked this conversation as resolved.
Show resolved Hide resolved
xortive marked this conversation as resolved.
Show resolved Hide resolved
xortive marked this conversation as resolved.
Show resolved Hide resolved
pub static WAVING: Emoji = Emoji("👋 ", "");
pub static WORKER: Emoji = Emoji("👷 ", "");