Skip to content

Commit 668a4bf

Browse files
committed
remove error option in FlashStub::get
1 parent a9d51de commit 668a4bf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

espflash/src/flasher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ impl Flasher {
253253
debug!("Loading flash stub for chip: {:?}", self.chip);
254254

255255
// Load flash stub
256-
let stub = FlashStub::get(self.chip).unwrap();
256+
let stub = FlashStub::get(self.chip);
257257

258258
let mut ram_target = self.chip.ram_target(Some(stub.entry()));
259259
ram_target.begin(&mut self.connection).flashing()?;

espflash/src/stubs/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const STUB_8266: &str = include_str!("../../../stubs/stub_flasher_8266.json");
2828

2929
impl FlashStub {
3030
/// Fetch flash stub for the provided chip
31-
pub fn get(chip: Chip) -> Result<FlashStub, ()> {
31+
pub fn get(chip: Chip) -> FlashStub {
3232
let s = match chip {
3333
Chip::Esp32 => STUB_32,
3434
Chip::Esp32c2 => STUB_32C2,
@@ -38,9 +38,9 @@ impl FlashStub {
3838
Chip::Esp8266 => STUB_8266,
3939
};
4040

41-
let stub: FlashStub = serde_json::from_str(s).map_err(|_| ())?;
41+
let stub: FlashStub = serde_json::from_str(s).unwrap();
4242

43-
Ok(stub)
43+
stub
4444
}
4545

4646
/// Fetch stub entry point
@@ -72,7 +72,7 @@ mod tests {
7272
fn check_stub_encodings() {
7373
for c in Chip::iter() {
7474
// Stub must be valid json
75-
let s = FlashStub::get(c).unwrap();
75+
let s = FlashStub::get(c);
7676

7777
// Data decoded from b64
7878
let _ = s.text();

0 commit comments

Comments
 (0)