From 320881e0b57d16a4f768a7c8543571e26113e904 Mon Sep 17 00:00:00 2001
From: Mara Bos <m-ou.se@m-ou.se>
Date: Wed, 14 Oct 2020 00:50:01 +0100
Subject: Merge HStdout and HStderr into the same type

This commit copies
https://github.com/rust-embedded/cortex-m-semihosting/pull/41
into the cortex-m repository.
---
 cortex-m-semihosting/src/export.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cortex-m-semihosting/src/export.rs')

diff --git a/cortex-m-semihosting/src/export.rs b/cortex-m-semihosting/src/export.rs
index c188ab0..0bbd09f 100644
--- a/cortex-m-semihosting/src/export.rs
+++ b/cortex-m-semihosting/src/export.rs
@@ -4,9 +4,9 @@ use core::fmt::{self, Write};
 
 use cortex_m::interrupt;
 
-use crate::hio::{self, HStderr, HStdout};
+use crate::hio::{self, HostStream};
 
-static mut HSTDOUT: Option<HStdout> = None;
+static mut HSTDOUT: Option<HostStream> = None;
 
 pub fn hstdout_str(s: &str) {
     let _result = interrupt::free(|_| unsafe {
@@ -28,7 +28,7 @@ pub fn hstdout_fmt(args: fmt::Arguments) {
     });
 }
 
-static mut HSTDERR: Option<HStderr> = None;
+static mut HSTDERR: Option<HostStream> = None;
 
 pub fn hstderr_str(s: &str) {
     let _result = interrupt::free(|_| unsafe {
-- 
cgit v1.2.3