Skip to content

Commit

Permalink
Merge pull request #118 from thenorili/filename-collision
Browse files Browse the repository at this point in the history
Avoid filename collision in the monorepo structure
  • Loading branch information
pksunkara authored Nov 10, 2023
2 parents 12479e9 + 1fc5c56 commit 2422bcd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion color-spantrace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ println!("{}", color_spantrace::colorize(&span_trace));

## Example

This example is taken from `examples/usage.rs`:
This example is taken from `examples/color-spantrace-usage.rs`:

```rust
use tracing::instrument;
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions color-spantrace/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
//!
//! ## Output Format
//!
//! Running `examples/usage.rs` from the `color-spantrace` repo produces the following output:
//! Running `examples/color-spantrace-usage.rs` from the `color-spantrace` repo produces the following output:
//!
//! <pre><font color="#4E9A06"><b>❯</b></font> cargo run --example usage
//! <pre><font color="#4E9A06"><b>❯</b></font> cargo run --example color-spantrace-usage
//! <font color="#4E9A06"><b> Finished</b></font> dev [unoptimized + debuginfo] target(s) in 0.04s
//! <font color="#4E9A06"><b> Running</b></font> `target/debug/examples/usage`
//! <font color="#4E9A06"><b> Running</b></font> `target/debug/examples/color-spantrace-usage`
//! ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ SPANTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
//!
//! 0: <font color="#F15D22">usage::two</font>
//! at <font color="#75507B">examples/usage.rs</font>:<font color="#75507B">18</font>
//! 1: <font color="#F15D22">usage::one</font> with <font color="#34E2E2">i=42</font>
//! at <font color="#75507B">examples/usage.rs</font>:<font color="#75507B">13</font></pre>
//! 0: <font color="#F15D22">color-spantrace-usage::two</font>
//! at <font color="#75507B">examples/color-spantrace-usage.rs</font>:<font color="#75507B">18</font>
//! 1: <font color="#F15D22">color-spantrace-usage::one</font> with <font color="#34E2E2">i=42</font>
//! at <font color="#75507B">examples/color-spantrace-usage.rs</font>:<font color="#75507B">13</font></pre>
//!
//! [`tracing_error::SpanTrace`]: https://docs.rs/tracing-error/*/tracing_error/struct.SpanTrace.html
//! [`color-backtrace`]: https://github.com/athre0z/color-backtrace
Expand Down
File renamed without changes.

0 comments on commit 2422bcd

Please sign in to comment.