Skip to content

Commit e7bdf47

Browse files
phi-gammaphi-gamma
committed
Replace try!() with ? operator
As of 1.39, the ``try!'' macro is deprecated: rust-lang/rust#62672 This changeset contains purely mechanical substitutions, no change in functionality.
1 parent bc71907 commit e7bdf47

File tree

12 files changed

+69
-72
lines changed

12 files changed

+69
-72
lines changed

‎src/client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ impl<S: Read + Write> Client<S> {
5858
let mut socket = BufStream::new(socket);
5959

6060
let mut banner = String::new();
61-
try!(socket.read_line(&mut banner));
61+
socket.read_line(&mut banner)?;
6262

6363
if !banner.starts_with("OK MPD ") {
6464
return Err(From::from(ProtoError::BadBanner));
6565
}
6666

67-
let version = try!(banner[7..].trim().parse::<Version>());
67+
let version = banner[7..].trim().parse::<Version>()?;
6868

6969
Ok(Client {
7070
socket: socket,
@@ -610,7 +610,7 @@ impl<S: Read + Write> Proto for Client<S> {
610610

611611
fn read_line(&mut self) -> Result<String> {
612612
let mut buf = String::new();
613-
try!(self.socket.read_line(&mut buf));
613+
self.socket.read_line(&mut buf)?;
614614
if buf.ends_with('\n') {
615615
buf.pop();
616616
}

‎src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl FromStr for ErrorCode {
5656
type Err = ParseError;
5757
fn from_str(s: &str) -> result::Result<ErrorCode, ParseError> {
5858
use self::ErrorCode::*;
59-
match try!(s.parse()) {
59+
match s.parse()? {
6060
1 => Ok(NotList),
6161
2 => Ok(Argument),
6262
3 => Ok(Password),

‎src/macros.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
macro_rules! get_field_impl {
44
($op:ident, $map:expr, bool $name:expr) => {
5-
try!($map.$op($name).ok_or(Error::Proto(ProtoError::NoField($name)))
6-
.map(|v| v == "1"))
5+
$map.$op($name).ok_or(Error::Proto(ProtoError::NoField($name)))
6+
.map(|v| v == "1")?
77
};
88
($op:ident, $map:expr, opt $name:expr) => {
9-
try!($map.$op($name).map(|v| v.parse().map(Some)).unwrap_or(Ok(None)))
9+
$map.$op($name).map(|v| v.parse().map(Some)).unwrap_or(Ok(None))?
1010
};
1111
($op:ident, $map:expr, $name:expr) => {
12-
try!($map.$op($name).ok_or(Error::Proto(ProtoError::NoField($name)))
13-
.and_then(|v| v.parse().map_err(|e| Error::Parse(From::from(e)))))
12+
$map.$op($name).ok_or(Error::Proto(ProtoError::NoField($name)))
13+
.and_then(|v| v.parse().map_err(|e| Error::Parse(From::from(e))))?
1414
};
1515
}
1616

‎src/message.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ pub struct Message {
2727
impl FromMap for Message {
2828
fn from_map(map: BTreeMap<String, String>) -> Result<Message, Error> {
2929
Ok(Message {
30-
channel: Channel(try!(map.get("channel").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("channel"))))),
31-
message: try!(map.get("message").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("message")))),
30+
channel: Channel(map.get("channel").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("channel")))?),
31+
message: map.get("message").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("message")))?,
3232
})
3333
}
3434
}

‎src/mount.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub struct Mount {
2626
impl FromMap for Mount {
2727
fn from_map(map: BTreeMap<String, String>) -> Result<Mount, Error> {
2828
Ok(Mount {
29-
name: try!(map.get("mount").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("mount")))),
30-
storage: try!(map.get("storage").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("storage")))),
29+
name: map.get("mount").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("mount")))?,
30+
storage: map.get("storage").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("storage")))?,
3131
})
3232
}
3333
}
@@ -44,8 +44,8 @@ pub struct Neighbor {
4444
impl FromMap for Neighbor {
4545
fn from_map(map: BTreeMap<String, String>) -> Result<Neighbor, Error> {
4646
Ok(Neighbor {
47-
name: try!(map.get("name").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("name")))),
48-
storage: try!(map.get("neighbor").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("neighbor")))),
47+
name: map.get("name").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("name")))?,
48+
storage: map.get("neighbor").map(|s| s.to_owned()).ok_or(Error::Proto(ProtoError::NoField("neighbor")))?,
4949
})
5050
}
5151
}

‎src/output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl FromMap for Output {
2121
fn from_map(map: BTreeMap<String, String>) -> Result<Output, Error> {
2222
Ok(Output {
2323
id: get_field!(map, "outputid"),
24-
name: try!(map.get("outputname").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("outputname")))),
24+
name: map.get("outputname").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("outputname")))?,
2525
enabled: get_field!(map, bool "outputenabled"),
2626
})
2727
}

‎src/playlist.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ pub struct Playlist {
1818
impl FromMap for Playlist {
1919
fn from_map(map: BTreeMap<String, String>) -> Result<Playlist, Error> {
2020
Ok(Playlist {
21-
name: try!(map.get("playlist").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("playlist")))),
22-
last_mod: try!(map.get("Last-Modified")
21+
name: map.get("playlist").map(|v| v.to_owned()).ok_or(Error::Proto(ProtoError::NoField("playlist")))?,
22+
last_mod: map.get("Last-Modified")
2323
.ok_or(Error::Proto(ProtoError::NoField("Last-Modified")))
24-
.and_then(|v| strptime(&*v, "%Y-%m-%dT%H:%M:%S%Z").map_err(From::from))),
24+
.and_then(|v| strptime(&*v, "%Y-%m-%dT%H:%M:%S%Z").map_err(From::from))?,
2525
})
2626
}
2727
}

‎src/plugin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ impl FromIter for Vec<Plugin> {
1919
let mut result = Vec::new();
2020
let mut plugin: Option<Plugin> = None;
2121
for reply in iter {
22-
let (a, b) = try!(reply);
22+
let (a, b) = reply?;
2323
match &*a {
2424
"plugin" => {
2525
plugin.map(|p| result.push(p));

‎src/proto.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ pub trait Proto {
123123

124124
fn drain(&mut self) -> Result<()> {
125125
loop {
126-
let reply = try!(self.read_line());
126+
let reply = self.read_line()?;
127127
match &*reply {
128128
"OK" | "list_OK" => break,
129129
_ => (),
@@ -133,7 +133,7 @@ pub trait Proto {
133133
}
134134

135135
fn expect_ok(&mut self) -> Result<()> {
136-
let line = try!(self.read_line());
136+
let line = self.read_line()?;
137137

138138
match line.parse::<Reply>() {
139139
Ok(Reply::Ok) => Ok(()),
@@ -144,7 +144,7 @@ pub trait Proto {
144144
}
145145

146146
fn read_pair(&mut self) -> Result<(String, String)> {
147-
let line = try!(self.read_line());
147+
let line = self.read_line()?;
148148

149149
match line.parse::<Reply>() {
150150
Ok(Reply::Pair(a, b)) => Ok((a, b)),

‎src/song.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -147,49 +147,49 @@ impl FromIter for Song {
147147
let mut result = Song::default();
148148

149149
for res in iter {
150-
let line = try!(res);
150+
let line = res?;
151151
match &*line.0 {
152152
"file" => result.file = line.1.to_owned(),
153153
"Title" => result.title = Some(line.1.to_owned()),
154-
"Last-Modified" => result.last_mod = try!(strptime(&*line.1, "%Y-%m-%dT%H:%M:%S%Z").map_err(ParseError::BadTime).map(Some)),
154+
"Last-Modified" => result.last_mod = strptime(&*line.1, "%Y-%m-%dT%H:%M:%S%Z").map_err(ParseError::BadTime).map(Some)?,
155155
"Artist" => result.artist = Some(line.1.to_owned()),
156156
"Name" => result.name = Some(line.1.to_owned()),
157-
"Time" => result.duration = Some(Duration::seconds(try!(line.1.parse()))),
158-
"Range" => result.range = Some(try!(line.1.parse())),
157+
"Time" => result.duration = Some(Duration::seconds(line.1.parse()?)),
158+
"Range" => result.range = Some(line.1.parse()?),
159159
"Id" => {
160160
match result.place {
161161
None => {
162162
result.place = Some(QueuePlace {
163-
id: Id(try!(line.1.parse())),
163+
id: Id(line.1.parse()?),
164164
pos: 0,
165165
prio: 0,
166166
})
167167
}
168-
Some(ref mut place) => place.id = Id(try!(line.1.parse())),
168+
Some(ref mut place) => place.id = Id(line.1.parse()?),
169169
}
170170
}
171171
"Pos" => {
172172
match result.place {
173173
None => {
174174
result.place = Some(QueuePlace {
175-
pos: try!(line.1.parse()),
175+
pos: line.1.parse()?,
176176
id: Id(0),
177177
prio: 0,
178178
})
179179
}
180-
Some(ref mut place) => place.pos = try!(line.1.parse()),
180+
Some(ref mut place) => place.pos = line.1.parse()?,
181181
}
182182
}
183183
"Prio" => {
184184
match result.place {
185185
None => {
186186
result.place = Some(QueuePlace {
187-
prio: try!(line.1.parse()),
187+
prio: line.1.parse()?,
188188
id: Id(0),
189189
pos: 0,
190190
})
191191
}
192-
Some(ref mut place) => place.prio = try!(line.1.parse()),
192+
Some(ref mut place) => place.prio = line.1.parse()?,
193193
}
194194
}
195195
_ => {

0 commit comments

Comments
 (0)