Skip to content

Commit 66acfe9

Browse files
gnxlxnxxgnxlxnxx
committed
fix warnings
1 parent cb28b14 commit 66acfe9

File tree

8 files changed

+50
-45
lines changed

8 files changed

+50
-45
lines changed

‎serial-core/README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ fn probe<P: SerialPort>(port: &mut P) -> io::Result<()> {
4242
let mut buf: Vec<u8> = (0..255).collect();
4343

4444
// configuration
45-
try!(port.reconfigure(&|settings| {
46-
try!(settings.set_baud_rate(serial::Baud9600));
45+
port.reconfigure(&|settings| {
46+
settings.set_baud_rate(serial::Baud9600)?;
4747
settings.set_char_size(serial::Bits8);
4848
settings.set_parity(serial::ParityNone);
4949
settings.set_stop_bits(serial::Stop1);
5050
settings.set_flow_control(serial::FlowNone);
5151
Ok(())
52-
}));
52+
})?;
5353

5454
// I/O
55-
try!(port.set_timeout(Duration::from_millis(100)));
56-
try!(port.write(&buf[..]));
57-
try!(port.read(&mut buf[..]));
55+
port.set_timeout(Duration::from_millis(99))?;
56+
port.write(&buf[..])?;
57+
port.read(&mut buf[..])?;
5858

5959
// control signals
60-
try!(port.set_dtr(true));
61-
try!(port.read_dsr());
60+
port.set_dtr(true)?;
61+
port.read_dsr()?;
6262

6363
Ok(())
6464
}
@@ -91,20 +91,20 @@ impl<P: SerialPort> Greet for Handle<P> {
9191
fn get_name(&mut self) -> serial::Result<String> {
9292
let mut name = String::new();
9393

94-
try!(self.port.write("What is your name? "));
95-
try!(self.port.read_to_string(&mut name));
94+
self.port.write("What is your name? ")?;
95+
self.port.read_to_string(&mut name)?;
9696

9797
Ok(name)
9898
}
9999

100100
fn say_hello(&mut self, name: &String) -> serial::Result<()> {
101-
try!(writeln!(&mut self.port, "Hello, {}!", name));
101+
writeln!(&mut self.port, "Hello, {}!", name)?;
102102
Ok(())
103103
}
104104
}
105105

106106
fn greet(greeter: &mut Greet) -> serial::Result<()> {
107-
let name = try!(greeter.get_name());
107+
let name = greeter.get_name()?;
108108

109109
greeter.say_hello(name)
110110
}

‎serial-core/src/lib.rs

+12-6
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,10 @@ pub trait SerialPort: io::Read + io::Write {
492492
/// })
493493
/// }
494494
/// ```
495-
fn reconfigure(&mut self, setup: &Fn(&mut SerialPortSettings) -> ::Result<()>) -> ::Result<()>;
495+
fn reconfigure(
496+
&mut self,
497+
setup: &dyn Fn(&mut dyn SerialPortSettings) -> ::Result<()>,
498+
) -> ::Result<()>;
496499

497500
/// Sets the state of the RTS (Request To Send) control signal.
498501
///
@@ -585,9 +588,9 @@ impl<T> SerialPort for T
585588
}
586589

587590
fn configure(&mut self, settings: &PortSettings) -> ::Result<()> {
588-
let mut device_settings = try!(T::read_settings(self));
591+
let mut device_settings = T::read_settings(self)?;
589592

590-
try!(device_settings.set_baud_rate(settings.baud_rate));
593+
device_settings.set_baud_rate(settings.baud_rate)?;
591594
device_settings.set_char_size(settings.char_size);
592595
device_settings.set_parity(settings.parity);
593596
device_settings.set_stop_bits(settings.stop_bits);
@@ -596,9 +599,12 @@ impl<T> SerialPort for T
596599
T::write_settings(self, &device_settings)
597600
}
598601

599-
fn reconfigure(&mut self, setup: &Fn(&mut SerialPortSettings) -> ::Result<()>) -> ::Result<()> {
600-
let mut device_settings = try!(T::read_settings(self));
601-
try!(setup(&mut device_settings));
602+
fn reconfigure(
603+
&mut self,
604+
setup: &dyn Fn(&mut dyn SerialPortSettings) -> ::Result<()>,
605+
) -> ::Result<()> {
606+
let mut device_settings = T::read_settings(self)?;
607+
setup(&mut device_settings)?;
602608
T::write_settings(self, &device_settings)
603609
}
604610

‎serial-unix/src/error.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use core;
22

3-
use std::error::Error;
43
use std::ffi::CStr;
54
use std::io;
65
use std::str;
@@ -30,7 +29,7 @@ pub fn from_io_error(io_error: io::Error) -> core::Error {
3029
match io_error.raw_os_error() {
3130
Some(errno) => from_raw_os_error(errno),
3231
None => {
33-
let description = io_error.description().to_string();
32+
let description = io_error.to_string();
3433

3534
core::Error::new(core::ErrorKind::Io(io_error.kind()), description)
3635
}

‎serial-unix/src/tty.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ impl TTYPort {
7979
}
8080

8181
// apply initial settings
82-
let settings = try!(port.read_settings());
83-
try!(port.write_settings(&settings));
82+
let settings = port.read_settings()?;
83+
port.write_settings(&settings)?;
8484

8585
Ok(port)
8686
}
@@ -126,7 +126,7 @@ impl AsRawFd for TTYPort {
126126

127127
impl io::Read for TTYPort {
128128
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
129-
try!(super::poll::wait_read_fd(self.fd, self.timeout));
129+
super::poll::wait_read_fd(self.fd, self.timeout)?;
130130

131131
let len = unsafe {
132132
libc::read(self.fd, buf.as_ptr() as *mut c_void, buf.len() as size_t)
@@ -143,7 +143,7 @@ impl io::Read for TTYPort {
143143

144144
impl io::Write for TTYPort {
145145
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
146-
try!(super::poll::wait_write_fd(self.fd, self.timeout));
146+
super::poll::wait_write_fd(self.fd, self.timeout)?;
147147

148148
let len = unsafe {
149149
libc::write(self.fd, buf.as_ptr() as *mut c_void, buf.len() as size_t)

‎serial-windows/src/com.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl COMPort {
5858
timeout: timeout,
5959
};
6060

61-
try!(port.set_timeout(timeout));
61+
port.set_timeout(timeout)?;
6262
Ok(port)
6363
}
6464
else {

‎serial/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ fn main() {
5050
}
5151

5252
fn interact<T: SerialPort>(port: &mut T) -> io::Result<()> {
53-
try!(port.reconfigure(&|settings| {
54-
try!(settings.set_baud_rate(serial::Baud9600));
53+
port.reconfigure(&|settings| {
54+
settings.set_baud_rate(serial::Baud9600)?;
5555
settings.set_char_size(serial::Bits8);
5656
settings.set_parity(serial::ParityNone);
5757
settings.set_stop_bits(serial::Stop1);
5858
settings.set_flow_control(serial::FlowNone);
5959
Ok(())
60-
}));
60+
})?;
6161

62-
try!(port.set_timeout(Duration::from_millis(1000)));
62+
port.set_timeout(Duration::from_millis(1000))?;
6363

6464
let mut buf: Vec<u8> = (0..255).collect();
6565

66-
try!(port.write(&buf[..]));
67-
try!(port.read(&mut buf[..]));
66+
port.write(&buf[..])?;
67+
port.read(&mut buf[..])?;
6868

6969
Ok(())
7070
}

‎serial/examples/probe_pins.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ fn main() {
2323
}
2424

2525
fn probe_pins<T: SerialPort>(port: &mut T) -> serial::Result<()> {
26-
try!(port.configure(&SETTINGS));
27-
try!(port.set_timeout(Duration::from_millis(100)));
26+
port.configure(&SETTINGS)?;
27+
port.set_timeout(Duration::from_millis(100))?;
2828

29-
try!(port.set_rts(false));
30-
try!(port.set_dtr(false));
29+
port.set_rts(false)?;
30+
port.set_dtr(false)?;
3131

3232
let mut rts = false;
3333
let mut dtr = false;
@@ -38,20 +38,20 @@ fn probe_pins<T: SerialPort>(port: &mut T) -> serial::Result<()> {
3838

3939
if toggle {
4040
rts = !rts;
41-
try!(port.set_rts(rts));
41+
port.set_rts(rts)?;
4242
}
4343
else {
4444
dtr = !dtr;
45-
try!(port.set_dtr(dtr));
45+
port.set_dtr(dtr)?;
4646
}
4747

4848
println!("RTS={:5?} DTR={:5?} CTS={:5?} DSR={:5?} RI={:5?} CD={:?}",
4949
rts,
5050
dtr,
51-
try!(port.read_cts()),
52-
try!(port.read_dsr()),
53-
try!(port.read_ri()),
54-
try!(port.read_cd()));
51+
port.read_cts()?,
52+
port.read_dsr()?,
53+
port.read_ri()?,
54+
port.read_cd())?;
5555

5656
toggle = !toggle;
5757
}

‎serial/examples/read_write.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ fn main() {
2424
}
2525

2626
fn interact<T: SerialPort>(port: &mut T) -> serial::Result<()> {
27-
try!(port.configure(&SETTINGS));
28-
try!(port.set_timeout(Duration::from_secs(1)));
27+
port.configure(&SETTINGS)?;
28+
port.set_timeout(Duration::from_secs(1))?;
2929

3030
let mut buf: Vec<u8> = (0..255).collect();
3131

3232
println!("writing bytes");
33-
try!(port.write(&buf[..]));
33+
port.write(&buf[..])?;
3434

3535
println!("reading bytes");
36-
try!(port.read(&mut buf[..]));
36+
port.read(&mut buf[..])?;
3737

3838
Ok(())
3939
}

0 commit comments

Comments
 (0)