修复Warning
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
use std::fmt::Display;
|
||||
use crate::download_wrapper::DownloadError::JlinkNotFindError;
|
||||
use anyhow::Error;
|
||||
use std::fs;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::path::PathBuf;
|
||||
use std::process::Command;
|
||||
use std::io::Write;
|
||||
|
||||
@@ -20,13 +20,14 @@ pub enum DownloadType {
|
||||
Rail,
|
||||
}
|
||||
|
||||
impl ToString for DownloadType {
|
||||
fn to_string(&self) -> String {
|
||||
match self {
|
||||
impl Display for DownloadType {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
let str = match self {
|
||||
DownloadType::Bootloader => "BootLoader".to_string(),
|
||||
DownloadType::App => "App".to_string(),
|
||||
DownloadType::Rail => "Rail".to_string(),
|
||||
}
|
||||
};
|
||||
write!(f, "{}", str)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -142,10 +143,10 @@ impl DownloadWrapper {
|
||||
} else {
|
||||
let Some(label) = label else { return Err(DownloadError::NoLabel) };
|
||||
match self.save_log(label, result_str.clone()) {
|
||||
Ok(res) => {
|
||||
Ok(_) => {
|
||||
Ok(result_str)
|
||||
}
|
||||
Err(e) => {
|
||||
Err(_) => {
|
||||
Err(DownloadError::DownloadBootloaderError)
|
||||
}
|
||||
}
|
||||
@@ -193,10 +194,10 @@ impl DownloadWrapper {
|
||||
} else {
|
||||
let Some(label) = label else { return Err(DownloadError::NoLabel) };
|
||||
match self.save_log(label, result_str.clone()) {
|
||||
Ok(res) => {
|
||||
Ok(_) => {
|
||||
Ok(result_str)
|
||||
}
|
||||
Err(e) => {
|
||||
Err(_) => {
|
||||
Err(DownloadError::DownloadBootloaderError)
|
||||
}
|
||||
}
|
||||
@@ -250,28 +251,28 @@ impl DownloadWrapper {
|
||||
#[test]
|
||||
fn test_erase_device() {
|
||||
let dw = DownloadWrapper::new();
|
||||
let result = dw.erase();
|
||||
let result = dw.erase(Some("111".to_string()));
|
||||
assert_eq!(result.is_ok(), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_download_bootloader() {
|
||||
let dw = DownloadWrapper::new();
|
||||
let result = dw.download(DownloadType::Bootloader);
|
||||
let result = dw.download(DownloadType::Bootloader, Some("111".to_string()));
|
||||
assert_eq!(result.is_ok(), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_download_app() {
|
||||
let dw = DownloadWrapper::new();
|
||||
let result = dw.download(DownloadType::App);
|
||||
let result = dw.download(DownloadType::App, Some("111".to_string()));
|
||||
assert_eq!(result.is_ok(), true);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_download_rail() {
|
||||
let dw = DownloadWrapper::new();
|
||||
let result = dw.download(DownloadType::Rail);
|
||||
let result = dw.download(DownloadType::Rail, Some("111".to_string()));
|
||||
assert_eq!(result.is_ok(), true);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user