Skip to content

Commit 442c30e

Browse files
chris-morganchris-morgan
committed
Rust update: s/if_ok!/try!/ (rust-lang/rust#12401)
1 parent a6a22f0 commit 442c30e

13 files changed

+75
-75
lines changed

‎src/codegen/branchify.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ pub fn generate_branchified_method(
9292
let indentstr = " ".repeat(indent * 4);
9393
macro_rules! w (
9494
($s:expr) => {
95-
if_ok!(write!(writer, "{}{}\n", indentstr, $s))
95+
try!(write!(writer, "{}{}\n", indentstr, $s))
9696
}
9797
)
9898
for &c in branch.matches.iter() {
9999
let next_prefix = format!("{}{}", prefix, c as char);
100100
w!(format!("Ok(b) if b == '{}' as u8 => match {} \\{", c as char, read_call));
101101
for b in branch.children.iter() {
102-
if_ok!(r(writer, b, next_prefix, indent + 1, read_call, end, max_len, valid, unknown));
102+
try!(r(writer, b, next_prefix, indent + 1, read_call, end, max_len, valid, unknown));
103103
}
104104
match branch.result {
105105
Some(ref result) =>
@@ -117,13 +117,13 @@ pub fn generate_branchified_method(
117117
let indentstr = " ".repeat(indent * 4);
118118
macro_rules! w (
119119
($s:expr) => {
120-
if_ok!(write!(writer, "{}{}\n", indentstr, $s))
120+
try!(write!(writer, "{}{}\n", indentstr, $s))
121121
}
122122
)
123123

124124
w!(format!("let (s, next_byte) = match {} \\{", read_call));
125125
for b in branches.iter() {
126-
if_ok!(r(writer, b, "", indent + 1, read_call, end, max_len, valid, unknown));
126+
try!(r(writer, b, "", indent + 1, read_call, end, max_len, valid, unknown));
127127
}
128128
w!(format!(" Ok(b) if {} => (\"\", b),", valid));
129129
w!( (" Ok(_) => return Err(::std::io::IoError { kind: ::std::io::OtherIoError, desc: \"bad value\", detail: None }),"));

‎src/codegen/read_method.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::io::IoResult;
44

55
pub fn generate(output_dir: &Path) -> IoResult<()> {
66
let mut writer = get_writer(output_dir, "read_method.rs");
7-
if_ok!(writer.write(bytes!("\
7+
try!(writer.write(bytes!("\
88
// This automatically generated file is included in request.rs.
99
{
1010
use method::{Connect, Delete, Get, Head, Options, Patch, Post, Put, Trace, ExtensionMethod};
@@ -13,7 +13,7 @@ pub fn generate(output_dir: &Path) -> IoResult<()> {
1313
1414
")));
1515

16-
if_ok!(generate_branchified_method(
16+
try!(generate_branchified_method(
1717
writer,
1818
branchify!(case sensitive,
1919
"CONNECT" => Connect,

‎src/codegen/status.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub fn generate(output_dir: &Path) -> IoResult<()> {
157157
Status(status) => status.reason.len(),
158158
}).max_by(|&i| i).unwrap();
159159
}
160-
if_ok!(out.write("// This file is automatically generated file is used as http::status.
160+
try!(out.write("// This file is automatically generated file is used as http::status.
161161
162162
use std::fmt;
163163
use std::ascii::StrAsciiExt;
@@ -168,15 +168,15 @@ pub enum Status {
168168
".as_bytes()));
169169
for &entry in entries.iter() {
170170
match entry {
171-
Heading(heading) => if_ok!(write!(out, "\n // {}\n", heading)),
171+
Heading(heading) => try!(write!(out, "\n // {}\n", heading)),
172172
Status(status) => match status.comment {
173-
None => if_ok!(write!(out, " {},\n", status.ident())),
174-
Some(comment) => if_ok!(write!(out, " {}, // {}\n", status.ident(), comment)),
173+
None => try!(write!(out, " {},\n", status.ident())),
174+
Some(comment) => try!(write!(out, " {}, // {}\n", status.ident(), comment)),
175175
},
176176
}
177177
}
178178

179-
if_ok!(out.write("
179+
try!(out.write("
180180
UnregisteredStatus(u16, ~str),
181181
}
182182
@@ -188,12 +188,12 @@ impl Status {
188188
".as_bytes()));
189189
for &entry in entries.iter() {
190190
match entry {
191-
Heading(heading) => if_ok!(write!(out, "\n // {}\n", heading)),
192-
Status(status) => if_ok!(write!(out, " {} => {},\n",
191+
Heading(heading) => try!(write!(out, "\n // {}\n", heading)),
192+
Status(status) => try!(write!(out, " {} => {},\n",
193193
status.padded_ident(), status.code)),
194194
}
195195
}
196-
if_ok!(out.write("
196+
try!(out.write("
197197
UnregisteredStatus(code, _) => code,
198198
}
199199
}
@@ -204,12 +204,12 @@ impl Status {
204204
".as_bytes()));
205205
for &entry in entries.iter() {
206206
match entry {
207-
Heading(heading) => if_ok!(write!(out, "\n // {}\n", heading)),
208-
Status(status) => if_ok!(write!(out, " {} => ~\"{}\",\n",
207+
Heading(heading) => try!(write!(out, "\n // {}\n", heading)),
208+
Status(status) => try!(write!(out, " {} => ~\"{}\",\n",
209209
status.padded_ident(), status.reason))
210210
}
211211
}
212-
if_ok!(out.write("
212+
try!(out.write("
213213
UnregisteredStatus(_, ref reason) => (*reason).clone(),
214214
}
215215
}
@@ -221,15 +221,15 @@ impl Status {
221221
".as_bytes()));
222222
for &entry in entries.iter() {
223223
match entry {
224-
Heading(heading) => if_ok!(write!(out, "\n // {}\n", heading)),
225-
Status(status) => if_ok!(write!(out, " ({}, \"{}\"){} => {},\n",
224+
Heading(heading) => try!(write!(out, "\n // {}\n", heading)),
225+
Status(status) => try!(write!(out, " ({}, \"{}\"){} => {},\n",
226226
status.code,
227227
status.reason.to_ascii_lower(),
228228
status.reason_padding_spaces(),
229229
status.ident())),
230230
}
231231
}
232-
if_ok!(out.write("
232+
try!(out.write("
233233
(_, _) => UnregisteredStatus(status, reason),
234234
}
235235
}
@@ -295,12 +295,12 @@ impl FromPrimitive for Status {
295295
let mut matched_numbers = HashSet::new();
296296
for &entry in entries.iter() {
297297
match entry {
298-
Heading(heading) => if_ok!(write!(out, "\n // {}\n", heading)),
298+
Heading(heading) => try!(write!(out, "\n // {}\n", heading)),
299299
Status(status) => {
300300
if !matched_numbers.contains(&status.code) {
301301
// Purpose: FailedDependency and MethodFailure both use 424,
302302
// but clearly they mustn't both go in here
303-
if_ok!(write!(out, " {:u} => {},\n", status.code, status.ident()));
303+
try!(write!(out, " {:u} => {},\n", status.code, status.ident()));
304304
matched_numbers.insert(status.code);
305305
}
306306
},

‎src/http/buffer.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl<T: Reader> BufferedStream<T> {
7676
pub fn read_byte(&mut self) -> IoResult<u8> {
7777
if self.read_pos == self.read_max {
7878
// Fill the buffer, giving up if we've run out of buffered content
79-
if_ok!(self.fill_buffer());
79+
try!(self.fill_buffer());
8080
}
8181
self.read_pos += 1;
8282
Ok(self.read_buffer[self.read_pos - 1])
@@ -90,9 +90,9 @@ impl<T: Writer> BufferedStream<T> {
9090
/// At the time of calling this, headers MUST have been written, including the
9191
/// ending CRLF, or else an invalid HTTP response may be written.
9292
pub fn finish_response(&mut self) -> IoResult<()> {
93-
if_ok!(self.flush());
93+
try!(self.flush());
9494
if self.writing_chunked_body {
95-
if_ok!(self.wrapped.write(bytes!("0\r\n\r\n")));
95+
try!(self.wrapped.write(bytes!("0\r\n\r\n")));
9696
}
9797
Ok(())
9898
}
@@ -106,7 +106,7 @@ impl<T: Reader> Reader for BufferedStream<T> {
106106
fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> {
107107
if self.read_pos == self.read_max {
108108
// Fill the buffer, giving up if we've run out of buffered content
109-
if_ok!(self.fill_buffer());
109+
try!(self.fill_buffer());
110110
}
111111
let size = min(self.read_max - self.read_pos, buf.len());
112112
vec::bytes::copy_memory(buf, self.read_buffer.slice_from(self.read_pos).slice_to(size));
@@ -122,16 +122,16 @@ impl<T: Writer> Writer for BufferedStream<T> {
122122
// warranted. Maybe deal with that later.
123123
if self.writing_chunked_body {
124124
let s = format!("{}\r\n", (self.write_len + buf.len()).to_str_radix(16));
125-
if_ok!(self.wrapped.write(s.as_bytes()));
125+
try!(self.wrapped.write(s.as_bytes()));
126126
}
127127
if self.write_len > 0 {
128-
if_ok!(self.wrapped.write(self.write_buffer.slice_to(self.write_len)));
128+
try!(self.wrapped.write(self.write_buffer.slice_to(self.write_len)));
129129
self.write_len = 0;
130130
}
131-
if_ok!(self.wrapped.write(buf));
131+
try!(self.wrapped.write(buf));
132132
self.write_len = 0;
133133
if self.writing_chunked_body {
134-
if_ok!(self.wrapped.write(bytes!("\r\n")));
134+
try!(self.wrapped.write(bytes!("\r\n")));
135135
}
136136
} else {
137137
unsafe { self.write_buffer.mut_slice_from(self.write_len).copy_memory(buf); }
@@ -140,11 +140,11 @@ impl<T: Writer> Writer for BufferedStream<T> {
140140
if self.write_len == self.write_buffer.len() {
141141
if self.writing_chunked_body {
142142
let s = format!("{}\r\n", self.write_len.to_str_radix(16));
143-
if_ok!(self.wrapped.write(s.as_bytes()));
144-
if_ok!(self.wrapped.write(self.write_buffer));
145-
if_ok!(self.wrapped.write(bytes!("\r\n")));
143+
try!(self.wrapped.write(s.as_bytes()));
144+
try!(self.wrapped.write(self.write_buffer));
145+
try!(self.wrapped.write(bytes!("\r\n")));
146146
} else {
147-
if_ok!(self.wrapped.write(self.write_buffer));
147+
try!(self.wrapped.write(self.write_buffer));
148148
}
149149
self.write_len = 0;
150150
}
@@ -156,11 +156,11 @@ impl<T: Writer> Writer for BufferedStream<T> {
156156
if self.write_len > 0 {
157157
if self.writing_chunked_body {
158158
let s = format!("{}\r\n", self.write_len.to_str_radix(16));
159-
if_ok!(self.wrapped.write(s.as_bytes()));
159+
try!(self.wrapped.write(s.as_bytes()));
160160
}
161-
if_ok!(self.wrapped.write(self.write_buffer.slice_to(self.write_len)));
161+
try!(self.wrapped.write(self.write_buffer.slice_to(self.write_len)));
162162
if self.writing_chunked_body {
163-
if_ok!(self.wrapped.write(bytes!("\r\n")));
163+
try!(self.wrapped.write(bytes!("\r\n")));
164164
}
165165
self.write_len = 0;
166166
}

‎src/http/client/request.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,12 @@ impl<S: Reader + Writer> RequestWriter<S> {
110110
},
111111
};
112112

113-
let remote_addr = if_ok!(url_to_socket_addr(&url));
113+
let remote_addr = try!(url_to_socket_addr(&url));
114114
info!("using ip address {} for {}", remote_addr.to_str(), url.host);
115115

116116
fn url_to_socket_addr(url: &Url) -> IoResult<SocketAddr> {
117117
// Just grab the first IPv4 address
118-
let addrs = if_ok!(get_host_addresses(url.host));
118+
let addrs = try!(get_host_addresses(url.host));
119119
let addr = addrs.move_iter().find(|&a| {
120120
match a {
121121
Ipv4Addr(..) => true,
@@ -170,7 +170,7 @@ impl<S: Connecter + Reader + Writer> RequestWriter<S> {
170170

171171
self.stream = match self.remote_addr {
172172
Some(addr) => {
173-
let stream = if_ok!(Connecter::connect(addr));
173+
let stream = try!(Connecter::connect(addr));
174174
Some(BufferedStream::new(stream))
175175
},
176176
None => fail!("connect() called before remote_addr was set"),
@@ -196,19 +196,19 @@ impl<S: Connecter + Reader + Writer> RequestWriter<S> {
196196
fail!("RequestWriter.write_headers() called, but headers already written");
197197
}
198198
if self.stream.is_none() {
199-
if_ok!(self.connect());
199+
try!(self.connect());
200200
}
201201

202202
// Write the Request-Line (RFC2616 §5.1)
203203
// TODO: get to the point where we can say HTTP/1.1 with good conscience
204-
if_ok!(write!(self.stream.get_mut_ref() as &mut Writer,
204+
try!(write!(self.stream.get_mut_ref() as &mut Writer,
205205
"{} {}{}{} HTTP/1.0\r\n",
206206
self.method.to_str(),
207207
if self.url.path.len() > 0 { self.url.path.as_slice() } else { "/" },
208208
if self.url.query.len() > 0 { "?" } else { "" },
209209
url::query_to_str(&self.url.query)));
210210

211-
if_ok!(self.headers.write_all(self.stream.get_mut_ref()));
211+
try!(self.headers.write_all(self.stream.get_mut_ref()));
212212
self.headers_written = true;
213213
Ok(())
214214
}
@@ -239,7 +239,7 @@ impl<S: Connecter + Reader + Writer> RequestWriter<S> {
239239
impl<S: Reader + Writer + Connecter> Writer for RequestWriter<S> {
240240
fn write(&mut self, buf: &[u8]) -> IoResult<()> {
241241
if !self.headers_written {
242-
if_ok!(self.write_headers());
242+
try!(self.write_headers());
243243
}
244244
// TODO: decide whether using get_mut_ref() is sound
245245
// (it will cause failure if None)

‎src/http/common.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ pub fn read_http_version<R: Reader>
149149
// filled, so I must read it byte by byte to guarantee correctness.
150150
// (Sure, no sane person/library would send the first packet with "HTT"
151151
// and leave the "P/1.1" to the next packet, but it's *possible*.)
152-
let b0 = if_ok!(reader.read_byte());
153-
let b1 = if_ok!(reader.read_byte());
154-
let b2 = if_ok!(reader.read_byte());
155-
let b3 = if_ok!(reader.read_byte());
156-
let b4 = if_ok!(reader.read_byte());
152+
let b0 = try!(reader.read_byte());
153+
let b1 = try!(reader.read_byte());
154+
let b2 = try!(reader.read_byte());
155+
let b3 = try!(reader.read_byte());
156+
let b4 = try!(reader.read_byte());
157157
if (b0 != 'h' as u8 && b0 != 'H' as u8) ||
158158
(b1 != 't' as u8 && b1 != 'T' as u8) ||
159159
(b2 != 't' as u8 && b2 != 'T' as u8) ||
@@ -162,8 +162,8 @@ pub fn read_http_version<R: Reader>
162162
return Err(bad_input());
163163
}
164164

165-
let major = if_ok!(read_decimal(reader, |b| b == '.' as u8));
166-
let minor = if_ok!(read_decimal(reader, expected_end));
165+
let major = try!(read_decimal(reader, |b| b == '.' as u8));
166+
let minor = try!(read_decimal(reader, expected_end));
167167
Ok((major, minor))
168168
}
169169

‎src/http/headers/accept_ranges.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl super::HeaderConvertible for AcceptableRanges {
4545
NoAcceptableRanges => writer.write(bytes!("none")),
4646
RangeUnits(ref range_units) => {
4747
for ru in range_units.iter() {
48-
if_ok!(writer.write(match *ru {
48+
try!(writer.write(match *ru {
4949
Bytes => BYTES,
5050
OtherRangeUnit(ref ru) => ru.as_bytes(),
5151
}));

‎src/http/headers/content_type.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ impl super::HeaderConvertible for MediaType {
5959
}
6060

6161
fn to_stream<W: Writer>(&self, writer: &mut W) -> IoResult<()> {
62-
if_ok!(writer.write_token(self.type_));
63-
if_ok!(writer.write(['/' as u8]));
64-
if_ok!(writer.write_token(self.subtype));
62+
try!(writer.write_token(self.type_));
63+
try!(writer.write(['/' as u8]));
64+
try!(writer.write_token(self.subtype));
6565
writer.write_parameters(self.parameters)
6666
}
6767

‎src/http/headers/etag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl super::HeaderConvertible for EntityTag {
5959

6060
fn to_stream<W: Writer>(&self, writer: &mut W) -> IoResult<()> {
6161
if self.weak {
62-
if_ok!(writer.write(bytes!("W/")));
62+
try!(writer.write(bytes!("W/")));
6363
}
6464
writer.write_quoted_string(self.opaque_tag)
6565
}

‎src/http/headers/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,9 +576,9 @@ impl<T: CommaListHeaderConvertible> HeaderConvertible for ~[T] {
576576
fn to_stream<W: Writer>(&self, writer: &mut W) -> IoResult<()> {
577577
for (i, item) in self.iter().enumerate() {
578578
if i != 0 {
579-
if_ok!(writer.write(bytes!(", ")))
579+
try!(writer.write(bytes!(", ")))
580580
}
581-
if_ok!(item.to_stream(writer))
581+
try!(item.to_stream(writer))
582582
}
583583
Ok(())
584584
}
@@ -915,7 +915,7 @@ macro_rules! headers_mod {
915915
/// signal end of headers.
916916
pub fn write_all<W: Writer>(&self, writer: &mut W) -> IoResult<()> {
917917
for header in self.iter() {
918-
if_ok!(header.write_header(&mut *writer));
918+
try!(header.write_header(&mut *writer));
919919
}
920920
writer.write(bytes!("\r\n"))
921921
}
@@ -975,13 +975,13 @@ macro_rules! headers_mod {
975975
_ => (),
976976
}
977977

978-
if_ok!(write!(&mut *writer as &mut Writer, "{}: ", match *self {
978+
try!(write!(&mut *writer as &mut Writer, "{}: ", match *self {
979979
$($caps_ident(_) => $output_name,)*
980980
ExtensionHeader(..) => unreachable!(), // Already returned
981981
}));
982982

983983
// FIXME: all the `h` cases satisfy HeaderConvertible, can it be simplified?
984-
if_ok!(match *self {
984+
try!(match *self {
985985
$($caps_ident(ref h) => h.to_stream(writer),)*
986986
ExtensionHeader(..) => unreachable!(), // Already returned
987987
});

0 commit comments

Comments
 (0)