diff options
| author | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-02-06 10:58:29 +0100 |
|---|---|---|
| committer | Oliver Scherer <github35764891676564198441@oli-obk.de> | 2019-02-11 15:08:17 +0100 |
| commit | 1dba7cb20224b5bb3a22641b2f4f2f73e5157dee (patch) | |
| tree | a8da71dd7fd7e721f5694b1121a8e9461bbef4d8 /src/libstd | |
| parent | a83e73dce4f0e80ff7559b3816f4f24391d4ff53 (diff) | |
| download | rust-1dba7cb20224b5bb3a22641b2f4f2f73e5157dee.tar.gz rust-1dba7cb20224b5bb3a22641b2f4f2f73e5157dee.zip | |
Fiddle through the module visibilities for tests
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/mpsc/select.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/select_tests.rs | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index 9487c0cf674..e34fc5487cf 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -158,7 +158,7 @@ impl Select { } /// Helper method for skipping the preflight checks during testing - fn wait2(&self, do_preflight_checks: bool) -> usize { + pub(super) fn wait2(&self, do_preflight_checks: bool) -> usize { // Note that this is currently an inefficient implementation. We in // theory have knowledge about all receivers in the set ahead of time, // so this method shouldn't really have to iterate over all of them yet diff --git a/src/libstd/sync/mpsc/select_tests.rs b/src/libstd/sync/mpsc/select_tests.rs index 4f9ce20fc34..be048511caa 100644 --- a/src/libstd/sync/mpsc/select_tests.rs +++ b/src/libstd/sync/mpsc/select_tests.rs @@ -210,7 +210,7 @@ fn cloning3() { let mut h2 = s.handle(&rx2); unsafe { h2.add(); } unsafe { h1.add(); } - assert_eq!(s.wait(), h2.id); + assert_eq!(s.wait(), h2.id()); tx3.send(()).unwrap(); }); @@ -256,7 +256,7 @@ fn preflight4() { let s = Select::new(); let mut h = s.handle(&rx); unsafe { h.add(); } - assert_eq!(s.wait2(false), h.id); + assert_eq!(s.wait2(false), h.id()); } #[test] @@ -267,7 +267,7 @@ fn preflight5() { let s = Select::new(); let mut h = s.handle(&rx); unsafe { h.add(); } - assert_eq!(s.wait2(false), h.id); + assert_eq!(s.wait2(false), h.id()); } #[test] @@ -278,7 +278,7 @@ fn preflight6() { let s = Select::new(); let mut h = s.handle(&rx); unsafe { h.add(); } - assert_eq!(s.wait2(false), h.id); + assert_eq!(s.wait2(false), h.id()); } #[test] @@ -288,7 +288,7 @@ fn preflight7() { let s = Select::new(); let mut h = s.handle(&rx); unsafe { h.add(); } - assert_eq!(s.wait2(false), h.id); + assert_eq!(s.wait2(false), h.id()); } #[test] @@ -300,7 +300,7 @@ fn preflight8() { let s = Select::new(); let mut h = s.handle(&rx); unsafe { h.add(); } - assert_eq!(s.wait2(false), h.id); + assert_eq!(s.wait2(false), h.id()); } #[test] @@ -313,7 +313,7 @@ fn preflight9() { let s = Select::new(); let mut h = s.handle(&rx); unsafe { h.add(); } - assert_eq!(s.wait2(false), h.id); + assert_eq!(s.wait2(false), h.id()); } #[test] |
