mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
vmm: use let/else instead of if/unwrap
There shouldn't have been a safety comment here to begin with, as it's not unsafe to call unwrap. Signed-off-by: Alyssa Ross <hi@alyssa.is>
This commit is contained in:
committed by
Rob Bradford
parent
d897db17e2
commit
e8f021b05e
@@ -2528,12 +2528,9 @@ impl DeviceManager {
|
|||||||
snapshot: Option<&Snapshot>,
|
snapshot: Option<&Snapshot>,
|
||||||
) -> DeviceManagerResult<Arc<Console>> {
|
) -> DeviceManagerResult<Arc<Console>> {
|
||||||
let serial_config = self.config.lock().unwrap().serial.clone();
|
let serial_config = self.config.lock().unwrap().serial.clone();
|
||||||
if console_info.is_none() {
|
let Some(console_info) = console_info else {
|
||||||
return Err(DeviceManagerError::InvalidConsoleInfo);
|
return Err(DeviceManagerError::InvalidConsoleInfo);
|
||||||
}
|
};
|
||||||
|
|
||||||
// SAFETY: console_info is Some, so it's safe to unwrap.
|
|
||||||
let console_info = console_info.unwrap();
|
|
||||||
|
|
||||||
let serial_writer: Option<Box<dyn io::Write + Send>> = match console_info.serial {
|
let serial_writer: Option<Box<dyn io::Write + Send>> = match console_info.serial {
|
||||||
ConsoleTransport::File(ref file) | ConsoleTransport::Tty(ref file) => {
|
ConsoleTransport::File(ref file) | ConsoleTransport::Tty(ref file) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user