Skip to content

Commit ecacc56

Browse files
committed
Use names suggestive of channel endpoints
1 parent 68041b4 commit ecacc56

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

ui_test/src/lib.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pub fn run_tests(mut config: Config) -> Result<()> {
126126
});
127127

128128
// A channel for the messages emitted by the individual test threads.
129-
let (finish_file, finished_files) = crossbeam::channel::unbounded();
129+
let (finished_files_sender, finished_files_recv) = crossbeam::channel::unbounded();
130130
enum TestResult {
131131
Ok,
132132
Failed,
@@ -135,7 +135,7 @@ pub fn run_tests(mut config: Config) -> Result<()> {
135135

136136
s.spawn(|_| {
137137
if config.quiet {
138-
for (i, (_, result)) in finished_files.into_iter().enumerate() {
138+
for (i, (_, result)) in finished_files_recv.into_iter().enumerate() {
139139
// Humans start counting at 1
140140
let i = i + 1;
141141
match result {
@@ -148,7 +148,7 @@ pub fn run_tests(mut config: Config) -> Result<()> {
148148
}
149149
}
150150
} else {
151-
for (msg, result) in finished_files {
151+
for (msg, result) in finished_files_recv {
152152
eprint!("{msg} ... ");
153153
eprintln!(
154154
"{}",
@@ -166,9 +166,9 @@ pub fn run_tests(mut config: Config) -> Result<()> {
166166

167167
// Create N worker threads that receive files to test.
168168
for _ in 0..std::thread::available_parallelism().unwrap().get() {
169-
let finish_file = finish_file.clone();
169+
let finished_files_sender = finished_files_sender.clone();
170170
threads.push(s.spawn(|_| -> Result<()> {
171-
let finish_file = finish_file;
171+
let finished_files_sender = finished_files_sender;
172172
for path in &receive {
173173
if !config.path_filter.is_empty() {
174174
let path_display = path.display().to_string();
@@ -181,7 +181,8 @@ pub fn run_tests(mut config: Config) -> Result<()> {
181181
// Ignore file if only/ignore rules do (not) apply
182182
if !test_file_conditions(&comments, &target, &config) {
183183
ignored.fetch_add(1, Ordering::Relaxed);
184-
finish_file.send((path.display().to_string(), TestResult::Ignored))?;
184+
finished_files_sender
185+
.send((path.display().to_string(), TestResult::Ignored))?;
185186
continue;
186187
}
187188
// Run the test for all revisions
@@ -197,10 +198,10 @@ pub fn run_tests(mut config: Config) -> Result<()> {
197198
write!(msg, "(revision `{revision}`) ").unwrap();
198199
}
199200
if errors.is_empty() {
200-
finish_file.send((msg, TestResult::Ok))?;
201+
finished_files_sender.send((msg, TestResult::Ok))?;
201202
succeeded.fetch_add(1, Ordering::Relaxed);
202203
} else {
203-
finish_file.send((msg, TestResult::Failed))?;
204+
finished_files_sender.send((msg, TestResult::Failed))?;
204205
failures.lock().unwrap().push((
205206
path.clone(),
206207
m,

0 commit comments

Comments
 (0)