Merge branch 'master' into pr/d4h0/69

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] - ReleaseDate
 
+## [0.5.9] - 2020-12-02
+### Fixed
+- Bumped color-spantrace dependency version to fix a panic
+
 ## [0.5.8] - 2020-11-23
 ### Added
 - Exposed internal interfaces for the panic handler so that it can be wrapped
@@ -50,7 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   better compatibility with the Display trait
 
 <!-- next-url -->
-[Unreleased]: https://github.com/yaahc/color-eyre/compare/v0.5.8...HEAD
+[Unreleased]: https://github.com/yaahc/color-eyre/compare/v0.5.9...HEAD
+[0.5.9]: https://github.com/yaahc/color-eyre/compare/v0.5.8...v0.5.9
 [0.5.8]: https://github.com/yaahc/color-eyre/compare/v0.5.7...v0.5.8
 [0.5.7]: https://github.com/yaahc/color-eyre/compare/v0.5.6...v0.5.7
 [0.5.6]: https://github.com/yaahc/color-eyre/compare/v0.5.5...v0.5.6

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "color-eyre"
-version = "0.5.9-alpha.0"
+version = "0.5.9"
 authors = ["Jane Lusby <jlusby@yaah.dev>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"
@@ -22,8 +22,13 @@ eyre = "0.6.1"
 tracing-error = { version = "0.1.2", optional = true }
 backtrace = { version = "0.3.48", features = ["gimli-symbolize"] }
 indenter = "0.3.0"
+<<<<<<< HEAD
 owo-colors = "1.2.0"
 color-spantrace = { version = "0.1.5", optional = true }
+=======
+owo-colors = "1.0.3"
+color-spantrace = { version = "0.1.6", optional = true }
+>>>>>>> master
 once_cell = "1.4.0"
 url = { version = "2.1.1", optional = true }
 
@@ -37,12 +42,15 @@ ansi-parser = "0.6.5" # used for testing color schemes
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
 wasm-bindgen-test = "0.3.15"
 
+[profile.dev.package.backtrace]
+opt-level = 3
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[profile.dev.package.backtrace]
-opt-level = 3
+[package.metadata.release]
+no-dev-version = true
 
 [[package.metadata.release.pre-release-replacements]]
 file = "CHANGELOG.md"

src/lib.rs

@@ -334,7 +334,7 @@
 //! [`examples/custom_filter.rs`]: https://github.com/yaahc/color-eyre/blob/master/examples/custom_filter.rs
 //! [`examples/custom_section.rs`]: https://github.com/yaahc/color-eyre/blob/master/examples/custom_section.rs
 //! [`examples/multiple_errors.rs`]: https://github.com/yaahc/color-eyre/blob/master/examples/multiple_errors.rs
-#![doc(html_root_url = "https://docs.rs/color-eyre/0.5.8")]
+#![doc(html_root_url = "https://docs.rs/color-eyre/0.5.9")]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![warn(
     missing_docs,