the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

Fixup writetoline / log message collector warnings

Browse source
This commit is contained in:
Graham Christensen 2018-02-01 13:14:40 -05:00
parent aebecc2e0a
commit dd2bac70d5
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ofborg/src/tasks/log_message_collector.rs
View file

@ -149,7 +149,7 @@ impl worker::SimpleWorker for LogMessageCollector {
} }
fn consumer(&mut self, job: &LogMessage) -> worker::Actions { fn consumer(&mut self, job: &LogMessage) -> worker::Actions {
let mut handle = self.handle_for(&job.from).unwrap(); let handle = self.handle_for(&job.from).unwrap();
handle.write_to_line((job.message.line_number - 1) as usize, &job.message.output); handle.write_to_line((job.message.line_number - 1) as usize, &job.message.output);

12
ofborg/src/writetoline.rs
View file

@ -39,8 +39,6 @@ impl LineWriter {
} }
pub fn write_to_line(&mut self, line: usize, data: &str) { pub fn write_to_line(&mut self, line: usize, data: &str) {
let buffer_len = self.buffer.len();
let original_len = self.buffer.len(); let original_len = self.buffer.len();
while self.buffer.len() <= line { while self.buffer.len() <= line {
self.buffer.push("".to_owned()); self.buffer.push("".to_owned());
@ -58,7 +56,7 @@ impl LineWriter {
self.file self.file
.write_all(self.buffer.join("\n").as_bytes()) .write_all(self.buffer.join("\n").as_bytes())
.unwrap(); .unwrap();
self.file.write("\n".as_bytes()); self.file.write("\n".as_bytes()).unwrap();
} else { } else {
// println!("taking the append option"); // println!("taking the append option");
// println!("Writing {:?} to line {}", data, line); // println!("Writing {:?} to line {}", data, line);
@ -74,13 +72,13 @@ impl LineWriter {
// end // end
// println!("selected buffer: {:?}", to_write); // println!("selected buffer: {:?}", to_write);
self.file.write(to_write.as_bytes()).unwrap(); self.file.write(to_write.as_bytes()).unwrap();
self.file.write("\n".as_bytes()); self.file.write("\n".as_bytes()).unwrap();
} }
self.last_line = line; self.last_line = line;
} }
pub fn inner(mut self) -> File { pub fn inner(self) -> File {
self.file self.file
} }
} }
@ -336,7 +334,7 @@ mod tests {
#[test] #[test]
fn bench_lots_of_ordered_lines() { fn bench_lots_of_ordered_lines() {
let p = TestScratch::new_file("bench-ordered-lines"); let p = TestScratch::new_file("bench-ordered-lines");
let mut f = testfile(&p.path()); let f = testfile(&p.path());
let mut writer = LineWriter::new(f); let mut writer = LineWriter::new(f);
let timer = Instant::now(); let timer = Instant::now();
@ -351,7 +349,7 @@ mod tests {
#[test] #[test]
fn bench_lots_of_reversed_lines() { fn bench_lots_of_reversed_lines() {
let p = TestScratch::new_file("bench-reversed-lines"); let p = TestScratch::new_file("bench-reversed-lines");
let mut f = testfile(&p.path()); let f = testfile(&p.path());
let mut writer = LineWriter::new(f); let mut writer = LineWriter::new(f);
let timer = Instant::now(); let timer = Instant::now();