Skip to content

Commit

Permalink
Merge #686
Browse files Browse the repository at this point in the history
686: Update loom to 0.5 r=taiki-e a=taiki-e



Co-authored-by: Taiki Endo <[email protected]>
  • Loading branch information
bors[bot] and taiki-e authored Apr 13, 2021
2 parents 066cfca + ae5a85a commit bb64382
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion crossbeam-epoch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ memoffset = "0.6"
# This configuration option is outside of the normal semver guarantees: minor
# versions of crossbeam may make breaking changes to it at any time.
[target.'cfg(crossbeam_loom)'.dependencies]
loom-crate = { package = "loom", version = "0.4", optional = true }
loom-crate = { package = "loom", version = "0.5", optional = true }

[dependencies.crossbeam-utils]
version = "0.8.3"
Expand Down
2 changes: 1 addition & 1 deletion crossbeam-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ lazy_static = { version = "1.4.0", optional = true }
# This configuration option is outside of the normal semver guarantees: minor
# versions of crossbeam may make breaking changes to it at any time.
[target.'cfg(crossbeam_loom)'.dependencies]
loom = { version = "0.4", optional = true }
loom = { version = "0.5", optional = true }

[build-dependencies]
autocfg = "1.0.0"
Expand Down

0 comments on commit bb64382

Please sign in to comment.