Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prune duplicate crossbeam dependencies #1795

Merged
merged 1 commit into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tokio-executor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ keywords = ["futures", "tokio"]
categories = ["concurrency", "asynchronous"]

[dependencies]
crossbeam-utils = "0.6.2"
crossbeam-utils = "0.7.0"
futures = "0.1.19"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tokio-reactor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Event loop that drives Tokio I/O resources.
categories = ["asynchronous", "network-programming"]

[dependencies]
crossbeam-utils = "0.6.0"
crossbeam-utils = "0.7.0"
futures = "0.1.19"
lazy_static = "1.0.2"
log = "0.4.1"
Expand Down
4 changes: 2 additions & 2 deletions tokio-threadpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ categories = ["concurrency", "asynchronous"]
tokio-executor = "0.1.8"
futures = "0.1.19"
crossbeam-deque = "0.7.0"
crossbeam-queue = "0.1.0"
crossbeam-utils = "0.6.4"
crossbeam-queue = "0.2.0"
crossbeam-utils = "0.7.0"
num_cpus = "1.2"
slab = "0.4.1"
log = "0.4"
Expand Down
8 changes: 4 additions & 4 deletions tokio-threadpool/tests/threadpool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ fn force_shutdown_drops_futures() {
b.fetch_add(1, Relaxed);
})
.build();
let mut tx = pool.sender().clone();
let tx = pool.sender().clone();

tx.spawn(Never(num_drop.clone())).unwrap();

Expand Down Expand Up @@ -190,7 +190,7 @@ fn drop_threadpool_drops_futures() {
b.fetch_add(1, Relaxed);
})
.build();
let mut tx = pool.sender().clone();
let tx = pool.sender().clone();

tx.spawn(Never(num_drop.clone())).unwrap();

Expand Down Expand Up @@ -219,7 +219,7 @@ fn many_oneshot_futures() {

for _ in 0..50 {
let pool = ThreadPool::new();
let mut tx = pool.sender().clone();
let tx = pool.sender().clone();
let cnt = Arc::new(AtomicUsize::new(0));

for _ in 0..NUM {
Expand Down Expand Up @@ -251,7 +251,7 @@ fn many_multishot_futures() {

for _ in 0..50 {
let pool = ThreadPool::new();
let mut pool_tx = pool.sender().clone();
let pool_tx = pool.sender().clone();

let mut start_txs = Vec::with_capacity(TRACKS);
let mut final_rxs = Vec::with_capacity(TRACKS);
Expand Down
2 changes: 1 addition & 1 deletion tokio-timer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Timer facilities for Tokio
[dependencies]
futures = "0.1.19"
tokio-executor = "0.1.1"
crossbeam-utils = "0.6.0"
crossbeam-utils = "0.7.0"

# Backs `DelayQueue`
slab = "0.4.1"
Expand Down
2 changes: 1 addition & 1 deletion tokio-timer/tests/queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ fn reset_first_expiring_item_to_expire_later() {
let epoch = time.now();

let foo = queue.insert_at("foo", epoch + ms(200));
let bar = queue.insert_at("bar", epoch + ms(250));
let _bar = queue.insert_at("bar", epoch + ms(250));

task.enter(|| {
assert_not_ready!(queue);
Expand Down