Skip to content

Commit

Permalink
chore: remove once_cell patch for v1.13.1 (#325)
Browse files Browse the repository at this point in the history
Now that the `once_cell` changes that placate Miri have been released,
we no longer need a patch for this.
  • Loading branch information
hawkw committed Sep 28, 2022
1 parent 84b14df commit afa2b19
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 4 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ rlibc = "1.0"
bootloader = { version = "0.10.13" }
embedded-graphics = "0.7"
mycotest = { path = "mycotest" }
# we don't depend on this directly, but we need to ensure that `tracing` uses a
# Miri-compatible version of `once_cell`.
once_cell = { version = "1.15.0", default-features = false }

[dev-dependencies]
mycotest = { path = "mycotest", features = ["runner"] }
Expand Down Expand Up @@ -82,11 +85,6 @@ map-framebuffer = true
# use `tracing` 0.2 from git
tracing = { git = "https://github.com/tokio-rs/tracing" }
tracing-core = { git = "https://github.com/tokio-rs/tracing" }
# patch `once_cell` to use https://github.com/matklad/once_cell/pull/185 so that
# Miri doesn't reject `tracing`'s use of `once_cell`.
#
# remove this patch once once_cell#185 is merged.
once_cell = { git = "https://github.com/hawkw/once_cell", branch = "eliza/saethlin/provenance" }

# Custom profile for Loom tests: enable release optimizations so that the loom
# tests are less slow, but don't disable debug assertions.
Expand Down

0 comments on commit afa2b19

Please sign in to comment.