Move eyre code into a folder (#107)

eyre-rs · Oct 3, 2023 · a443fd4 · a443fd4
1 parent 044e2ae
commit a443fd4
Show file tree

Hide file tree

Showing 39 changed files with 99 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 /target
 **/*.rs.bk
 Cargo.lock
-/.pijul/
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 members = [
-  "."
+  "eyre"
 ]
 
 [workspace.package]
@@ -14,78 +14,3 @@ rust-version = "1.65.0"
 [workspace.dependencies]
 indenter = "0.3.0"
 once_cell = "1.18.0"
-
-[package]
-name = "eyre"
-version = "0.6.8"
-authors = ["David Tolnay <[email protected]>", "Jane Lusby <[email protected]>"]
-description = "Flexible concrete Error Reporting type built on std::error::Error with customizable Reports"
-documentation = "https://docs.rs/eyre"
-categories = ["rust-patterns"]
-
-edition = { workspace = true }
-license = { workspace = true }
-repository = { workspace = true }
-readme = { workspace = true }
-rust-version = { workspace = true }
-
-[features]
-default = ["auto-install", "track-caller"]
-auto-install = []
-track-caller = []
-
-[dependencies]
-indenter = { workspace = true }
-once_cell = { workspace = true }
-pyo3 = { version = "0.13", optional = true, default-features = false }
-
-[dev-dependencies]
-futures = { version = "0.3", default-features = false }
-rustversion = "1.0"
-thiserror = "1.0"
-trybuild = { version = "1.0.19", features = ["diff"] }
-backtrace = "0.3.46"
-anyhow = "1.0.28"
-syn = { version = "2.0", features = ["full"] }
-pyo3 = { version = "0.13", default-features = false, features = ["auto-initialize"] }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
-rustdoc-args = ["--cfg", "doc_cfg"]
-
-[package.metadata.release]
-dev-version = false
-
-[[package.metadata.release.pre-release-replacements]]
-file = "CHANGELOG.md"
-search = "Unreleased"
-replace = "{{version}}"
-
-[[package.metadata.release.pre-release-replacements]]
-file = "src/lib.rs"
-search = "#!\\[doc\\(html_root_url.*"
-replace = "#![doc(html_root_url = \"https://docs.rs/{{crate_name}}/{{version}}\")]"
-exactly = 1
-
-[[package.metadata.release.pre-release-replacements]]
-file = "CHANGELOG.md"
-search = "\\.\\.\\.HEAD"
-replace = "...{{tag_name}}"
-exactly = 1
-
-[[package.metadata.release.pre-release-replacements]]
-file = "CHANGELOG.md"
-search = "ReleaseDate"
-replace = "{{date}}"
-
-[[package.metadata.release.pre-release-replacements]]
-file = "CHANGELOG.md"
-search = "<!-- next-header -->"
-replace = "<!-- next-header -->\n\n## [Unreleased] - ReleaseDate"
-exactly = 1
-
-[[package.metadata.release.pre-release-replacements]]
-file = "CHANGELOG.md"
-search = "<!-- next-url -->"
-replace = "<!-- next-url -->\n[Unreleased]: https://github.com/yaahc/{{crate_name}}/compare/{{tag_name}}...HEAD"
-exactly = 1
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ eyre
 [![Rust Documentation](https://img.shields.io/badge/api-rustdoc-blue.svg)](https://docs.rs/eyre)
 [![Discord chat][discord-badge]][discord-url]
 
-[actions-badge]: https://github.com/yaahc/eyre/workflows/Continuous%20integration/badge.svg
-[actions-url]: https://github.com/yaahc/eyre/actions?query=workflow%3A%22Continuous+integration%22
+[actions-badge]: https://github.com/eyre-rs/eyre/workflows/Continuous%20integration/badge.svg
+[actions-url]: https://github.com/eyre-rs/eyre/actions?query=workflow%3A%22Continuous+integration%22
 [discord-badge]: https://img.shields.io/discord/960645145018110012?label=eyre%20community%20discord
 [discord-url]: https://discord.gg/z94RqmUTKB
 
@@ -252,14 +252,14 @@ implements `context` for options which you can import to make existing
 [`anyhow::Context`]: https://docs.rs/anyhow/*/anyhow/trait.Context.html
 [`anyhow`]: https://github.com/dtolnay/anyhow
 [`tracing_error::SpanTrace`]: https://docs.rs/tracing-error/*/tracing_error/struct.SpanTrace.html
-[`stable-eyre`]: https://github.com/yaahc/stable-eyre
-[`color-eyre`]: https://github.com/yaahc/color-eyre
+[`stable-eyre`]: https://github.com/eyre-rs/stable-eyre
+[`color-eyre`]: https://github.com/eyre-rs/color-eyre
 [`jane-eyre`]: https://github.com/yaahc/jane-eyre
-[`simple-eyre`]: https://github.com/yaahc/simple-eyre
-[`color-spantrace`]: https://github.com/yaahc/color-spantrace
+[`simple-eyre`]: https://github.com/eyre-rs/simple-eyre
+[`color-spantrace`]: https://github.com/eyre-rs/color-spantrace
 [`color-backtrace`]: https://github.com/athre0z/color-backtrace
 
-[^1]: example and explanation of breakage https://github.com/yaahc/eyre/issues/30#issuecomment-647650361
+[^1]: example and explanation of breakage https://github.com/eyre-rs/eyre/issues/30#issuecomment-647650361
 
 #### License
 

diff --git a/CHANGELOG.md → eyre/CHANGELOG.md b/CHANGELOG.md → eyre/CHANGELOG.md
@@ -43,12 +43,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 <!-- next-url -->
-[Unreleased]: https://github.com/yaahc/eyre/compare/v0.6.8...HEAD
-[0.6.8]: https://github.com/yaahc/eyre/compare/v0.6.7...v0.6.8
-[0.6.7]: https://github.com/yaahc/eyre/compare/v0.6.6...v0.6.7
-[0.6.6]: https://github.com/yaahc/eyre/compare/v0.6.5...v0.6.6
-[0.6.5]: https://github.com/yaahc/eyre/compare/v0.6.4...v0.6.5
-[0.6.4]: https://github.com/yaahc/eyre/compare/v0.6.3...v0.6.4
-[0.6.3]: https://github.com/yaahc/eyre/compare/v0.6.2...v0.6.3
-[0.6.2]: https://github.com/yaahc/eyre/compare/v0.6.1...v0.6.2
-[0.6.1]: https://github.com/yaahc/eyre/releases/tag/v0.6.1
+[Unreleased]: https://github.com/eyre-rs/eyre/compare/v0.6.8...HEAD
+[0.6.8]: https://github.com/eyre-rs/eyre/compare/v0.6.7...v0.6.8
+[0.6.7]: https://github.com/eyre-rs/eyre/compare/v0.6.6...v0.6.7
+[0.6.6]: https://github.com/eyre-rs/eyre/compare/v0.6.5...v0.6.6
+[0.6.5]: https://github.com/eyre-rs/eyre/compare/v0.6.4...v0.6.5
+[0.6.4]: https://github.com/eyre-rs/eyre/compare/v0.6.3...v0.6.4
+[0.6.3]: https://github.com/eyre-rs/eyre/compare/v0.6.2...v0.6.3
+[0.6.2]: https://github.com/eyre-rs/eyre/compare/v0.6.1...v0.6.2
+[0.6.1]: https://github.com/eyre-rs/eyre/releases/tag/v0.6.1
diff --git a/eyre/Cargo.toml b/eyre/Cargo.toml
@@ -0,0 +1,74 @@
+[package]
+name = "eyre"
+version = "0.6.8"
+authors = ["David Tolnay <[email protected]>", "Jane Lusby <[email protected]>"]
+description = "Flexible concrete Error Reporting type built on std::error::Error with customizable Reports"
+documentation = "https://docs.rs/eyre"
+categories = ["rust-patterns"]
+
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+readme = { workspace = true }
+rust-version = { workspace = true }
+
+[features]
+default = ["auto-install", "track-caller"]
+auto-install = []
+track-caller = []
+
+[dependencies]
+indenter = { workspace = true }
+once_cell = { workspace = true }
+pyo3 = { version = "0.13", optional = true, default-features = false }
+
+[dev-dependencies]
+futures = { version = "0.3", default-features = false }
+rustversion = "1.0"
+thiserror = "1.0"
+trybuild = { version = "1.0.19", features = ["diff"] }
+backtrace = "0.3.46"
+anyhow = "1.0.28"
+syn = { version = "2.0", features = ["full"] }
+pyo3 = { version = "0.13", default-features = false, features = ["auto-initialize"] }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+rustdoc-args = ["--cfg", "doc_cfg"]
+
+[package.metadata.release]
+dev-version = false
+
+[[package.metadata.release.pre-release-replacements]]
+file = "CHANGELOG.md"
+search = "Unreleased"
+replace = "{{version}}"
+
+[[package.metadata.release.pre-release-replacements]]
+file = "src/lib.rs"
+search = "#!\\[doc\\(html_root_url.*"
+replace = "#![doc(html_root_url = \"https://docs.rs/{{crate_name}}/{{version}}\")]"
+exactly = 1
+
+[[package.metadata.release.pre-release-replacements]]
+file = "CHANGELOG.md"
+search = "\\.\\.\\.HEAD"
+replace = "...{{tag_name}}"
+exactly = 1
+
+[[package.metadata.release.pre-release-replacements]]
+file = "CHANGELOG.md"
+search = "ReleaseDate"
+replace = "{{date}}"
+
+[[package.metadata.release.pre-release-replacements]]
+file = "CHANGELOG.md"
+search = "<!-- next-header -->"
+replace = "<!-- next-header -->\n\n## [Unreleased] - ReleaseDate"
+exactly = 1
+
+[[package.metadata.release.pre-release-replacements]]
+file = "CHANGELOG.md"
+search = "<!-- next-url -->"
+replace = "<!-- next-url -->\n[Unreleased]: https://github.com/eyre-rs/{{crate_name}}/compare/{{tag_name}}...HEAD"
+exactly = 1
diff --git a/eyre/LICENSE-APACHE b/eyre/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
diff --git a/eyre/LICENSE-MIT b/eyre/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
diff --git a/eyre/README.md b/eyre/README.md
@@ -0,0 +1 @@
+../README.md
diff --git a/build.rs → eyre/build.rs b/build.rs → eyre/build.rs
diff --git a/examples/custom_handler.rs → eyre/examples/custom_handler.rs b/examples/custom_handler.rs → eyre/examples/custom_handler.rs
diff --git a/examples/usage.rs → eyre/examples/usage.rs b/examples/usage.rs → eyre/examples/usage.rs
diff --git a/src/backtrace.rs → eyre/src/backtrace.rs b/src/backtrace.rs → eyre/src/backtrace.rs
diff --git a/src/chain.rs → eyre/src/chain.rs b/src/chain.rs → eyre/src/chain.rs
diff --git a/src/context.rs → eyre/src/context.rs b/src/context.rs → eyre/src/context.rs
diff --git a/src/error.rs → eyre/src/error.rs b/src/error.rs → eyre/src/error.rs
diff --git a/src/error/pyo3_compat.rs → eyre/src/error/pyo3_compat.rs b/src/error/pyo3_compat.rs → eyre/src/error/pyo3_compat.rs
diff --git a/src/fmt.rs → eyre/src/fmt.rs b/src/fmt.rs → eyre/src/fmt.rs
diff --git a/src/kind.rs → eyre/src/kind.rs b/src/kind.rs → eyre/src/kind.rs
diff --git a/src/lib.rs → eyre/src/lib.rs b/src/lib.rs → eyre/src/lib.rs
@@ -314,19 +314,19 @@
 //! implements `context` for options which you can import to make existing
 //! `.context` calls compile.
 //!
-//! [^1]: example and explanation of breakage https://github.com/yaahc/eyre/issues/30#issuecomment-647650361
+//! [^1]: example and explanation of breakage https://github.com/eyre-rs/eyre/issues/30#issuecomment-647650361
 //!
 //! [Report]: https://docs.rs/eyre/*/eyre/struct.Report.html
 //! [`eyre::EyreHandler`]: https://docs.rs/eyre/*/eyre/trait.EyreHandler.html
 //! [`eyre::WrapErr`]: https://docs.rs/eyre/*/eyre/trait.WrapErr.html
 //! [`anyhow::Context`]: https://docs.rs/anyhow/*/anyhow/trait.Context.html
 //! [`anyhow`]: https://github.com/dtolnay/anyhow
 //! [`tracing_error::SpanTrace`]: https://docs.rs/tracing-error/*/tracing_error/struct.SpanTrace.html
-//! [`stable-eyre`]: https://github.com/yaahc/stable-eyre
-//! [`color-eyre`]: https://github.com/yaahc/color-eyre
+//! [`stable-eyre`]: https://github.com/eyre-rs/stable-eyre
+//! [`color-eyre`]: https://github.com/eyre-rs/color-eyre
 //! [`jane-eyre`]: https://github.com/yaahc/jane-eyre
-//! [`simple-eyre`]: https://github.com/yaahc/simple-eyre
-//! [`color-spantrace`]: https://github.com/yaahc/color-spantrace
+//! [`simple-eyre`]: https://github.com/eyre-rs/simple-eyre
+//! [`color-spantrace`]: https://github.com/eyre-rs/color-spantrace
 //! [`color-backtrace`]: https://github.com/athre0z/color-backtrace
 #![doc(html_root_url = "https://docs.rs/eyre/0.6.8")]
 #![warn(

diff --git a/src/macros.rs → eyre/src/macros.rs b/src/macros.rs → eyre/src/macros.rs
diff --git a/src/ptr.rs → eyre/src/ptr.rs b/src/ptr.rs → eyre/src/ptr.rs
diff --git a/src/wrapper.rs → eyre/src/wrapper.rs b/src/wrapper.rs → eyre/src/wrapper.rs
diff --git a/tests/common/mod.rs → eyre/tests/common/mod.rs b/tests/common/mod.rs → eyre/tests/common/mod.rs
diff --git a/tests/compiletest.rs → eyre/tests/compiletest.rs b/tests/compiletest.rs → eyre/tests/compiletest.rs
diff --git a/tests/drop/mod.rs → eyre/tests/drop/mod.rs b/tests/drop/mod.rs → eyre/tests/drop/mod.rs
diff --git a/tests/test_autotrait.rs → eyre/tests/test_autotrait.rs b/tests/test_autotrait.rs → eyre/tests/test_autotrait.rs
diff --git a/tests/test_boxed.rs → eyre/tests/test_boxed.rs b/tests/test_boxed.rs → eyre/tests/test_boxed.rs
diff --git a/tests/test_chain.rs → eyre/tests/test_chain.rs b/tests/test_chain.rs → eyre/tests/test_chain.rs
diff --git a/tests/test_context.rs → eyre/tests/test_context.rs b/tests/test_context.rs → eyre/tests/test_context.rs
diff --git a/tests/test_context_access.rs → eyre/tests/test_context_access.rs b/tests/test_context_access.rs → eyre/tests/test_context_access.rs
diff --git a/tests/test_convert.rs → eyre/tests/test_convert.rs b/tests/test_convert.rs → eyre/tests/test_convert.rs
diff --git a/tests/test_downcast.rs → eyre/tests/test_downcast.rs b/tests/test_downcast.rs → eyre/tests/test_downcast.rs
diff --git a/tests/test_fmt.rs → eyre/tests/test_fmt.rs b/tests/test_fmt.rs → eyre/tests/test_fmt.rs
diff --git a/tests/test_location.rs → eyre/tests/test_location.rs b/tests/test_location.rs → eyre/tests/test_location.rs
diff --git a/tests/test_macros.rs → eyre/tests/test_macros.rs b/tests/test_macros.rs → eyre/tests/test_macros.rs
diff --git a/tests/test_no_install.rs → eyre/tests/test_no_install.rs b/tests/test_no_install.rs → eyre/tests/test_no_install.rs
diff --git a/tests/test_pyo3.rs → eyre/tests/test_pyo3.rs b/tests/test_pyo3.rs → eyre/tests/test_pyo3.rs
diff --git a/tests/test_repr.rs → eyre/tests/test_repr.rs b/tests/test_repr.rs → eyre/tests/test_repr.rs
diff --git a/tests/test_source.rs → eyre/tests/test_source.rs b/tests/test_source.rs → eyre/tests/test_source.rs