Skip to content
This repository was archived by the owner on Sep 13, 2023. It is now read-only.

Commit b355852

Browse files
committed
Merge #47
47: Revert main error r=killercup a=killercup Seems like what I had in mind in #31 didn't work: It breaks failure's macros and with it the waltz_cli crate. This reverts #32. I'll publish 0.1.4 if this is green (I've yanked 0.1.3).
2 parents 3a2f20e + 3120c85 commit b355852

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "quicli"
3-
version = "0.1.3"
3+
version = "0.1.4"
44
description = "Quickly build cool CLI apps in Rust."
55
authors = ["Pascal Hertleif <[email protected]>"]
66
readme = "Readme.md"

Changelog.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9-
## [0.1.3] - 2018-02-01
9+
## [0.1.4] - 2018-02-09
10+
11+
### Changed
12+
13+
- Reverts "`main!` now uses the more permissive `std::result::Result` enum and `std::error::Error` trait." from 0.1.3 which broke existing code
14+
15+
## [0.1.3] - 2018-02-01 - Yanked!
1016

1117
### Changed
1218

src/main_macro.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
macro_rules! main {
3333
(|$args:ident: $cli:ty, log_level: $verbosity:ident| $body:expr) => {
3434
fn main() {
35-
fn run() -> std::result::Result<(), Box<std::error::Error>> {
35+
fn run() -> $crate::prelude::Result<()> {
3636
let $args = <$cli>::from_args();
3737
let log_level = match $args.verbosity {
3838
0 => $crate::prelude::LogLevel::Error,
@@ -64,7 +64,7 @@ macro_rules! main {
6464

6565
(|$args:ident: $cli:ty| $body:expr) => {
6666
fn main() {
67-
fn run() -> std::result::Result<(), Box<std::error::Error>> {
67+
fn run() -> $crate::prelude::Result<()> {
6868
let $args = <$cli>::from_args();
6969
$crate::prelude::LoggerBuiler::new()
7070
.filter(Some(env!("CARGO_PKG_NAME")), $crate::prelude::LogLevel::Error.to_level_filter())
@@ -90,7 +90,7 @@ macro_rules! main {
9090

9191
($body:expr) => {
9292
fn main() {
93-
fn run() -> std::result::Result<(), Box<std::error::Error>> {
93+
fn run() -> $crate::prelude::Result<()> {
9494
$crate::prelude::LoggerBuiler::new()
9595
.filter(Some(env!("CARGO_PKG_NAME")), $crate::prelude::LogLevel::Error.to_level_filter())
9696
.filter(None, $crate::prelude::LogLevel::Warn.to_level_filter())

0 commit comments

Comments
 (0)