Skip to content

Commit 8b7d032

Browse files
alexcrichtonalexcrichton
committed
rollup merge of rust-lang#20273: alexcrichton/second-pass-comm
Conflicts: src/doc/guide.md src/libcollections/bit.rs src/libcollections/btree/node.rs src/libcollections/slice.rs src/libcore/ops.rs src/libcore/prelude.rs src/librand/rand_impls.rs src/librustc/middle/check_match.rs src/librustc/middle/infer/region_inference/mod.rs src/librustc_driver/lib.rs src/librustdoc/test.rs src/libstd/bitflags.rs src/libstd/io/comm_adapters.rs src/libstd/io/mem.rs src/libstd/io/mod.rs src/libstd/io/net/pipe.rs src/libstd/io/net/tcp.rs src/libstd/io/net/udp.rs src/libstd/io/pipe.rs src/libstd/io/process.rs src/libstd/io/stdio.rs src/libstd/io/timer.rs src/libstd/io/util.rs src/libstd/macros.rs src/libstd/os.rs src/libstd/path/posix.rs src/libstd/path/windows.rs src/libstd/prelude/v1.rs src/libstd/rand/mod.rs src/libstd/rand/os.rs src/libstd/sync/barrier.rs src/libstd/sync/condvar.rs src/libstd/sync/future.rs src/libstd/sync/mpsc/mod.rs src/libstd/sync/mpsc/mpsc_queue.rs src/libstd/sync/mpsc/select.rs src/libstd/sync/mpsc/spsc_queue.rs src/libstd/sync/mutex.rs src/libstd/sync/once.rs src/libstd/sync/rwlock.rs src/libstd/sync/semaphore.rs src/libstd/sync/task_pool.rs src/libstd/sys/common/helper_thread.rs src/libstd/sys/unix/process.rs src/libstd/sys/unix/timer.rs src/libstd/sys/windows/c.rs src/libstd/sys/windows/timer.rs src/libstd/sys/windows/tty.rs src/libstd/thread.rs src/libstd/thread_local/mod.rs src/libstd/thread_local/scoped.rs src/libtest/lib.rs src/test/auxiliary/cci_capture_clause.rs src/test/bench/shootout-reverse-complement.rs src/test/bench/shootout-spectralnorm.rs src/test/compile-fail/array-old-syntax-2.rs src/test/compile-fail/bind-by-move-no-guards.rs src/test/compile-fail/builtin-superkinds-self-type.rs src/test/compile-fail/comm-not-freeze-receiver.rs src/test/compile-fail/comm-not-freeze.rs src/test/compile-fail/issue-12041.rs src/test/compile-fail/unsendable-class.rs src/test/run-pass/builtin-superkinds-capabilities-transitive.rs src/test/run-pass/builtin-superkinds-capabilities-xc.rs src/test/run-pass/builtin-superkinds-capabilities.rs src/test/run-pass/builtin-superkinds-self-type.rs src/test/run-pass/capturing-logging.rs src/test/run-pass/closure-bounds-can-capture-chan.rs src/test/run-pass/comm.rs src/test/run-pass/core-run-destroy.rs src/test/run-pass/drop-trait-enum.rs src/test/run-pass/hashmap-memory.rs src/test/run-pass/issue-13494.rs src/test/run-pass/issue-3609.rs src/test/run-pass/issue-4446.rs src/test/run-pass/issue-4448.rs src/test/run-pass/issue-8827.rs src/test/run-pass/issue-9396.rs src/test/run-pass/ivec-tag.rs src/test/run-pass/rust-log-filter.rs src/test/run-pass/send-resource.rs src/test/run-pass/send-type-inference.rs src/test/run-pass/sendable-class.rs src/test/run-pass/spawn-types.rs src/test/run-pass/task-comm-0.rs src/test/run-pass/task-comm-10.rs src/test/run-pass/task-comm-11.rs src/test/run-pass/task-comm-13.rs src/test/run-pass/task-comm-14.rs src/test/run-pass/task-comm-15.rs src/test/run-pass/task-comm-16.rs src/test/run-pass/task-comm-3.rs src/test/run-pass/task-comm-4.rs src/test/run-pass/task-comm-5.rs src/test/run-pass/task-comm-6.rs src/test/run-pass/task-comm-7.rs src/test/run-pass/task-comm-9.rs src/test/run-pass/task-comm-chan-nil.rs src/test/run-pass/task-spawn-move-and-copy.rs src/test/run-pass/task-stderr.rs src/test/run-pass/tcp-accept-stress.rs src/test/run-pass/tcp-connect-timeouts.rs src/test/run-pass/tempfile.rs src/test/run-pass/trait-bounds-in-arc.rs src/test/run-pass/trivial-message.rs src/test/run-pass/unique-send-2.rs src/test/run-pass/unique-send.rs src/test/run-pass/unwind-resource.rs
2 parents 5696ea5 + bc83a00 commit 8b7d032

File tree

111 files changed

+1138
-1160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+1138
-1160
lines changed

‎src/doc/reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3174,6 +3174,7 @@ then the expression completes.
31743174
Some examples of call expressions:
31753175

31763176
```
3177+
# use std::str::from_str;
31773178
# fn add(x: int, y: int) -> int { 0 }
31783179
31793180
let x: int = add(1, 2);

‎src/etc/licenseck.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"rt/isaac/randport.cpp", # public domain
3939
"rt/isaac/rand.h", # public domain
4040
"rt/isaac/standard.h", # public domain
41-
"libstd/comm/mpsc_queue.rs", # BSD
42-
"libstd/comm/spsc_queue.rs", # BSD
41+
"libstd/sync/mpsc/mpsc_queue.rs", # BSD
42+
"libstd/sync/mpsc/spsc_queue.rs", # BSD
4343
"test/bench/shootout-binarytrees.rs", # BSD
4444
"test/bench/shootout-chameneos-redux.rs", # BSD
4545
"test/bench/shootout-fannkuch-redux.rs", # BSD

‎src/liballoc/arc.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ impl<T: Default + Sync + Send> Default for Arc<T> {
593593
#[allow(experimental)]
594594
mod tests {
595595
use std::clone::Clone;
596-
use std::comm::channel;
596+
use std::sync::mpsc::channel;
597597
use std::mem::drop;
598598
use std::ops::Drop;
599599
use std::option::Option;
@@ -630,11 +630,11 @@ mod tests {
630630
let (tx, rx) = channel();
631631

632632
task::spawn(move || {
633-
let arc_v: Arc<Vec<int>> = rx.recv();
633+
let arc_v: Arc<Vec<int>> = rx.recv().unwrap();
634634
assert_eq!((*arc_v)[3], 4);
635635
});
636636

637-
tx.send(arc_v.clone());
637+
tx.send(arc_v.clone()).unwrap();
638638

639639
assert_eq!((*arc_v)[2], 3);
640640
assert_eq!((*arc_v)[4], 5);

‎src/libcollections/bit.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,9 @@ use core::cmp;
8787
use core::default::Default;
8888
use core::fmt;
8989
use core::hash;
90-
use core::iter::{Cloned, Chain, Enumerate, Repeat, Skip, Take, repeat};
91-
use core::iter::{mod, FromIterator, RandomAccessIterator};
90+
use core::iter::RandomAccessIterator;
91+
use core::iter::{Chain, Enumerate, Repeat, Skip, Take, repeat, Cloned};
92+
use core::iter::{mod, FromIterator};
9293
use core::num::Int;
9394
use core::ops::Index;
9495
use core::slice::{Iter, IterMut};

‎src/libcore/option.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,8 @@ impl<T: Default> Option<T> {
723723
/// `None` on error.
724724
///
725725
/// ```
726+
/// use std::str::from_str;
727+
///
726728
/// let good_year_from_input = "1909";
727729
/// let bad_year_from_input = "190blarg";
728730
/// let good_year = good_year_from_input.parse().unwrap_or_default();

‎src/libcore/result.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,7 @@ impl<T, E> Result<T, E> {
449449
///
450450
/// ```
451451
/// use std::io::IoResult;
452+
/// use std::str::from_str;
452453
///
453454
/// let mut buffer = &mut b"1\n2\n3\n4\n";
454455
///

‎src/librustc_driver/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ use rustc::DIAGNOSTICS;
5555

5656
use std::any::AnyRefExt;
5757
use std::cmp::Ordering::Equal;
58-
use std::comm::channel;
5958
use std::io;
6059
use std::iter::repeat;
6160
use std::os;
61+
use std::sync::mpsc::channel;
6262
use std::thread;
6363

6464
use rustc::session::early_error;

‎src/librustc_trans/back/write.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ use std::ptr;
3131
use std::str;
3232
use std::mem;
3333
use std::sync::{Arc, Mutex};
34+
use std::sync::mpsc::channel;
3435
use std::thread;
3536
use libc::{c_uint, c_int, c_void};
3637

@@ -929,13 +930,13 @@ fn run_work_multithreaded(sess: &Session,
929930
}
930931
}
931932

932-
tx.take().unwrap().send(());
933+
tx.take().unwrap().send(()).unwrap();
933934
}).detach();
934935
}
935936

936937
let mut panicked = false;
937938
for rx in futures.into_iter() {
938-
match rx.recv_opt() {
939+
match rx.recv() {
939940
Ok(()) => {},
940941
Err(_) => {
941942
panicked = true;

‎src/librustdoc/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
use std::cell::RefCell;
12-
use std::comm::channel;
12+
use std::sync::mpsc::channel;
1313
use std::dynamic_lib::DynamicLibrary;
1414
use std::io::{Command, TempDir};
1515
use std::io;

‎src/libstd/bitflags.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ macro_rules! bitflags {
266266
mod tests {
267267
use hash;
268268
use option::Option::{Some, None};
269-
use ops::{BitOr, BitAnd, BitXor, Sub, Not};
270269

271270
bitflags! {
272271
#[doc = "> The first principle is that you must not fool yourself — and"]

0 commit comments

Comments
 (0)