From 9f5b76253c8b63bc2a1b9af8589e5f54acc49498 Mon Sep 17 00:00:00 2001
From: whitequark <whitequark@whitequark.org>
Date: Tue, 15 May 2018 15:01:30 +0000
Subject: [PATCH] firmware: remove some unnecessary unwraps.

---
 artiq/firmware/runtime/moninj.rs   | 5 +++--
 artiq/firmware/runtime/rtio_dma.rs | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/artiq/firmware/runtime/moninj.rs b/artiq/firmware/runtime/moninj.rs
index 67b582ba2..d589d63d2 100644
--- a/artiq/firmware/runtime/moninj.rs
+++ b/artiq/firmware/runtime/moninj.rs
@@ -1,5 +1,6 @@
 use alloc::btree_map::BTreeMap;
 
+use io::Error as IoError;
 use moninj_proto::*;
 use sched::{Io, TcpListener, TcpStream, Error as SchedError};
 use board_misoc::{clock, csr};
@@ -184,7 +185,7 @@ fn connection_worker(io: &Io, mut stream: &mut TcpStream) -> Result<(), Error<Sc
         if clock::get_ms() > next_check {
             for (&(channel, probe), previous) in watch_list.iter_mut() {
                 let current = read_probe(channel, probe);
-                if previous.is_none() || (previous.unwrap() != current) {
+                if previous.is_none() || previous.unwrap() != current {
                     let message = DeviceMessage::MonitorStatus {
                         channel: channel,
                         probe: probe,
@@ -200,7 +201,7 @@ fn connection_worker(io: &Io, mut stream: &mut TcpStream) -> Result<(), Error<Sc
             next_check = clock::get_ms() + 200;
         }
 
-        io.relinquish().unwrap();
+        io.relinquish().map_err(|err| Error::Io(IoError::Other(err)))?;
     }
 }
 
diff --git a/artiq/firmware/runtime/rtio_dma.rs b/artiq/firmware/runtime/rtio_dma.rs
index 6c135e72a..39e61d621 100644
--- a/artiq/firmware/runtime/rtio_dma.rs
+++ b/artiq/firmware/runtime/rtio_dma.rs
@@ -1,8 +1,6 @@
 use core::mem;
 use alloc::{Vec, String, BTreeMap};
 
-use io::Write;
-
 const ALIGNMENT: usize = 64;
 
 #[derive(Debug)]
@@ -37,7 +35,7 @@ impl Manager {
     }
 
     pub fn record_append(&mut self, data: &[u8]) {
-        self.recording_trace.write_all(data).unwrap();
+        self.recording_trace.extend_from_slice(data)
     }
 
     pub fn record_stop(&mut self, duration: u64) {