Skip to content

Commit

Permalink
Merge pull request #8 from teohhanhui/feat/trace
Browse files Browse the repository at this point in the history
Add `trace` and `trace_futures` features to crate
  • Loading branch information
teohhanhui authored Jan 26, 2022
2 parents afb5f65 + 9028c81 commit 2110f1c
Show file tree
Hide file tree
Showing 36 changed files with 5,030 additions and 2,809 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS: -Dwarnings # https://github.com/rust-lang/cargo/issues/4423#issuecomment-404188918
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS: -Dwarnings # https://github.com/rust-lang/cargo/issues/4423#issuecomment-404188918
RUST_BACKTRACE: short
RUST_LOG: info
RUST_LOG: callbag=trace,info
RUSTFLAGS: -Dwarnings

jobs:
Expand Down Expand Up @@ -93,11 +93,11 @@ jobs:
with:
command: test
toolchain: ${{ matrix.rust }}
args: --no-fail-fast -- --show-output --test-threads=1
args: --no-fail-fast --features trace_futures -- --nocapture --test-threads=1
- name: Install wasm-pack
uses: ./.github/actions/install-wasm-pack
- name: Run tests (wasm32-unknown-unknown) (Node.js)
run: rustup run ${{ matrix.rust }} wasm-pack test --node
- name: Run tests (wasm32-unknown-unknown, node)
run: rustup run ${{ matrix.rust }} wasm-pack test --node -- --features trace_futures
- name: Install cargo-wasi
uses: ./.github/actions/cargo
with:
Expand All @@ -110,7 +110,7 @@ jobs:
with:
command: wasi
toolchain: ${{ matrix.rust }}
args: test --no-fail-fast -- --show-output --test-threads=1
args: test --no-fail-fast --features trace -- --nocapture --test-threads=1
- name: Run doctests
uses: ./.github/actions/cargo
with:
Expand Down Expand Up @@ -153,4 +153,4 @@ jobs:
with:
command: fmt
toolchain: stable
args: -- --check
args: --check
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Added

- Add `trace` feature to crate

## v0.14.0 - 2022-01-14

### Changed
Expand Down
9 changes: 7 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,24 @@ categories = ["asynchronous", "concurrency"]
arc-swap = "1.5.0"
async_executors = { version = "0.5.1", optional = true }
async_nursery = { version = "0.4.0", default-features = false, optional = true }
cfg-if = "1.0.0"
never = "0.1.0"
paste = { version = "1.0.6", optional = true }
tracing = { version = "0.1.29", optional = true }
tracing-futures = { version = "0.2.5", optional = true }

[dev-dependencies]
assert_matches = "1.5.0"
crossbeam-queue = "0.3.3"
paste = "1.0.6"
test-log = { version = "0.2.8", default-features = false, features = ["trace"] }
tracing = "0.1.29"
tracing-futures = "0.2.5"
tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }

[target.'cfg(not(all(target_arch = "wasm32", target_os = "wasi")))'.dev-dependencies]
async-std = { version = "1.10.0", features = ["attributes", "unstable"] }
async_executors = { version = "0.5.1", features = ["async_std", "tracing"] }
async_nursery = { version = "0.4.0", features = ["tracing"] }
tracing-futures = "0.2.5"

[target.'cfg(all(target_arch = "wasm32", not(target_os = "wasi")))'.dev-dependencies]
async_executors = { version = "0.5.1", features = ["timer"] }
Expand Down Expand Up @@ -66,6 +69,8 @@ scan = []
share = []
skip = []
take = []
trace = ["paste", "tracing"]
trace_futures = ["trace", "tracing-futures"]

[lib]
doctest = false
Expand Down
2 changes: 2 additions & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# empty_item_single_line = false
# error_on_line_overflow = true
# format_strings = true
# imports_layout = "HorizontalVertical"
match_block_trailing_comma = true
newline_style = "Unix"
Expand Down
262 changes: 184 additions & 78 deletions src/combine.rs

Large diffs are not rendered by default.

Loading

0 comments on commit 2110f1c

Please sign in to comment.