Skip to content

Commit f892c4b

Browse files
sfacklersfackler
committed
try! -> ?
1 parent c9d4aba commit f892c4b

File tree

5 files changed

+144
-140
lines changed

5 files changed

+144
-140
lines changed

‎postgres-protocol/src/authentication/sasl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ enum State {
7676
/// should be sent to the backend in a `SASLResponse` message.
7777
///
7878
/// The server will reply with an `AuthenticationSASLFinal` message. Its contents should be passed
79-
/// to the `finish()` method method, after which the authentication process is complete.
79+
/// to the `finish()` method, after which the authentication process is complete.
8080
pub struct ScramSha256 {
8181
message: String,
8282
state: State,
@@ -86,7 +86,7 @@ pub struct ScramSha256 {
8686
impl ScramSha256 {
8787
/// Constructs a new instance which will use the provided password for authentication.
8888
pub fn new(password: &[u8]) -> io::Result<ScramSha256> {
89-
let mut rng = try!(OsRng::new());
89+
let mut rng = OsRng::new()?;
9090
let nonce = (0..NONCE_LENGTH)
9191
.map(|_| {
9292
let mut v = rng.gen_range(0x21u8, 0x7e);

‎postgres-protocol/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ fn write_nullable<F, E>(serializer: F, buf: &mut Vec<u8>) -> Result<(), E>
4848
{
4949
let base = buf.len();
5050
buf.extend_from_slice(&[0; 4]);
51-
let size = match try!(serializer(buf)) {
52-
IsNull::No => try!(i32::from_usize(buf.len() - base - 4)),
51+
let size = match serializer(buf)? {
52+
IsNull::No => i32::from_usize(buf.len() - base - 4)?,
5353
IsNull::Yes => -1,
5454
};
5555
BigEndian::write_i32(&mut buf[base..], size);

‎postgres-protocol/src/message/backend.rs

+32-32
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ impl Message {
8181
b'2' => Message::BindComplete,
8282
b'3' => Message::CloseComplete,
8383
b'A' => {
84-
let process_id = try!(buf.read_i32::<BigEndian>());
85-
let channel = try!(buf.read_cstr());
86-
let message = try!(buf.read_cstr());
84+
let process_id = buf.read_i32::<BigEndian>()?;
85+
let channel = buf.read_cstr()?;
86+
let message = buf.read_cstr()?;
8787
Message::NotificationResponse(NotificationResponseBody {
8888
process_id: process_id,
8989
channel: channel,
@@ -92,15 +92,15 @@ impl Message {
9292
}
9393
b'c' => Message::CopyDone,
9494
b'C' => {
95-
let tag = try!(buf.read_cstr());
95+
let tag = buf.read_cstr()?;
9696
Message::CommandComplete(CommandCompleteBody { tag: tag })
9797
}
9898
b'd' => {
9999
let storage = buf.read_all();
100100
Message::CopyData(CopyDataBody { storage: storage })
101101
}
102102
b'D' => {
103-
let len = try!(buf.read_u16::<BigEndian>());
103+
let len = buf.read_u16::<BigEndian>()?;
104104
let storage = buf.read_all();
105105
Message::DataRow(DataRowBody {
106106
storage: storage,
@@ -112,8 +112,8 @@ impl Message {
112112
Message::ErrorResponse(ErrorResponseBody { storage: storage })
113113
}
114114
b'G' => {
115-
let format = try!(buf.read_u8());
116-
let len = try!(buf.read_u16::<BigEndian>());
115+
let format = buf.read_u8()?;
116+
let len = buf.read_u16::<BigEndian>()?;
117117
let storage = buf.read_all();
118118
Message::CopyInResponse(CopyInResponseBody {
119119
format: format,
@@ -122,8 +122,8 @@ impl Message {
122122
})
123123
}
124124
b'H' => {
125-
let format = try!(buf.read_u8());
126-
let len = try!(buf.read_u16::<BigEndian>());
125+
let format = buf.read_u8()?;
126+
let len = buf.read_u16::<BigEndian>()?;
127127
let storage = buf.read_all();
128128
Message::CopyOutResponse(CopyOutResponseBody {
129129
format: format,
@@ -133,8 +133,8 @@ impl Message {
133133
}
134134
b'I' => Message::EmptyQueryResponse,
135135
b'K' => {
136-
let process_id = try!(buf.read_i32::<BigEndian>());
137-
let secret_key = try!(buf.read_i32::<BigEndian>());
136+
let process_id = buf.read_i32::<BigEndian>()?;
137+
let secret_key = buf.read_i32::<BigEndian>()?;
138138
Message::BackendKeyData(BackendKeyDataBody {
139139
process_id: process_id,
140140
secret_key: secret_key,
@@ -146,13 +146,13 @@ impl Message {
146146
Message::NoticeResponse(NoticeResponseBody { storage: storage })
147147
}
148148
b'R' => {
149-
match try!(buf.read_i32::<BigEndian>()) {
149+
match buf.read_i32::<BigEndian>()? {
150150
0 => Message::AuthenticationOk,
151151
2 => Message::AuthenticationKerberosV5,
152152
3 => Message::AuthenticationCleartextPassword,
153153
5 => {
154154
let mut salt = [0; 4];
155-
try!(buf.read_exact(&mut salt));
155+
buf.read_exact(&mut salt)?;
156156
Message::AuthenticationMd5Password(AuthenticationMd5PasswordBody {
157157
salt: salt,
158158
})
@@ -184,31 +184,31 @@ impl Message {
184184
}
185185
b's' => Message::PortalSuspended,
186186
b'S' => {
187-
let name = try!(buf.read_cstr());
188-
let value = try!(buf.read_cstr());
187+
let name = buf.read_cstr()?;
188+
let value = buf.read_cstr()?;
189189
Message::ParameterStatus(ParameterStatusBody {
190190
name: name,
191191
value: value,
192192
})
193193
}
194194
b't' => {
195-
let len = try!(buf.read_u16::<BigEndian>());
195+
let len = buf.read_u16::<BigEndian>()?;
196196
let storage = buf.read_all();
197197
Message::ParameterDescription(ParameterDescriptionBody {
198198
storage: storage,
199199
len: len,
200200
})
201201
}
202202
b'T' => {
203-
let len = try!(buf.read_u16::<BigEndian>());
203+
let len = buf.read_u16::<BigEndian>()?;
204204
let storage = buf.read_all();
205205
Message::RowDescription(RowDescriptionBody {
206206
storage: storage,
207207
len: len,
208208
})
209209
}
210210
b'Z' => {
211-
let status = try!(buf.read_u8());
211+
let status = buf.read_u8()?;
212212
Message::ReadyForQuery(ReadyForQueryBody { status: status })
213213
}
214214
tag => {
@@ -309,14 +309,14 @@ impl<'a> FallibleIterator for SaslMechanisms<'a> {
309309

310310
#[inline]
311311
fn next(&mut self) -> io::Result<Option<&'a str>> {
312-
let value_end = try!(find_null(self.0, 0));
312+
let value_end = find_null(self.0, 0)?;
313313
if value_end == 0 {
314314
if self.0.len() != 1 {
315315
return Err(io::Error::new(io::ErrorKind::InvalidData, "invalid message length"));
316316
}
317317
Ok(None)
318318
} else {
319-
let value = try!(get_str(&self.0[..value_end]));
319+
let value = get_str(&self.0[..value_end])?;
320320
self.0 = &self.0[value_end + 1..];
321321
Ok(Some(value))
322322
}
@@ -494,7 +494,7 @@ impl<'a> FallibleIterator for DataRowRanges<'a> {
494494
}
495495

496496
self.remaining -= 1;
497-
let len = try!(self.buf.read_i32::<BigEndian>());
497+
let len = self.buf.read_i32::<BigEndian>()?;
498498
if len < 0 {
499499
Ok(Some(None))
500500
} else {
@@ -536,7 +536,7 @@ impl<'a> FallibleIterator for ErrorFields<'a> {
536536

537537
#[inline]
538538
fn next(&mut self) -> io::Result<Option<ErrorField<'a>>> {
539-
let type_ = try!(self.buf.read_u8());
539+
let type_ = self.buf.read_u8()?;
540540
if type_ == 0 {
541541
if self.buf.is_empty() {
542542
return Ok(None);
@@ -545,8 +545,8 @@ impl<'a> FallibleIterator for ErrorFields<'a> {
545545
}
546546
}
547547

548-
let value_end = try!(find_null(self.buf, 0));
549-
let value = try!(get_str(&self.buf[..value_end]));
548+
let value_end = find_null(self.buf, 0)?;
549+
let value = get_str(&self.buf[..value_end])?;
550550
self.buf = &self.buf[value_end + 1..];
551551

552552
Ok(Some(ErrorField {
@@ -715,15 +715,15 @@ impl<'a> FallibleIterator for Fields<'a> {
715715
}
716716

717717
self.remaining -= 1;
718-
let name_end = try!(find_null(self.buf, 0));
719-
let name = try!(get_str(&self.buf[..name_end]));
718+
let name_end = find_null(self.buf, 0)?;
719+
let name = get_str(&self.buf[..name_end])?;
720720
self.buf = &self.buf[name_end + 1..];
721-
let table_oid = try!(self.buf.read_u32::<BigEndian>());
722-
let column_id = try!(self.buf.read_i16::<BigEndian>());
723-
let type_oid = try!(self.buf.read_u32::<BigEndian>());
724-
let type_size = try!(self.buf.read_i16::<BigEndian>());
725-
let type_modifier = try!(self.buf.read_i32::<BigEndian>());
726-
let format = try!(self.buf.read_i16::<BigEndian>());
721+
let table_oid = self.buf.read_u32::<BigEndian>()?;
722+
let column_id = self.buf.read_i16::<BigEndian>()?;
723+
let type_oid = self.buf.read_u32::<BigEndian>()?;
724+
let type_size = self.buf.read_i16::<BigEndian>()?;
725+
let type_modifier = self.buf.read_i32::<BigEndian>()?;
726+
let format = self.buf.read_i16::<BigEndian>()?;
727727

728728
Ok(Some(Field {
729729
name: name,

‎postgres-protocol/src/message/frontend.rs

+23-23
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ impl<'a> Message<'a> {
5757
values,
5858
|v, buf| match *v {
5959
Some(ref v) => {
60-
buf.extend_from_slice(v);
61-
Ok(IsNull::No)
62-
}
60+
buf.extend_from_slice(v);
61+
Ok(IsNull::No)
62+
}
6363
None => Ok(IsNull::Yes),
6464
},
6565
result_formats.iter().cloned(),
@@ -110,9 +110,9 @@ fn write_body<F, E>(buf: &mut Vec<u8>, f: F) -> Result<(), E>
110110
let base = buf.len();
111111
buf.extend_from_slice(&[0; 4]);
112112

113-
try!(f(buf));
113+
f(buf)?;
114114

115-
let size = try!(i32::from_usize(buf.len() - base));
115+
let size = i32::from_usize(buf.len() - base)?;
116116
BigEndian::write_i32(&mut buf[base..], size);
117117
Ok(())
118118
}
@@ -153,13 +153,13 @@ pub fn bind<I, J, F, T, K>(portal: &str,
153153
buf.push(b'B');
154154

155155
write_body(buf, |buf| {
156-
try!(buf.write_cstr(portal));
157-
try!(buf.write_cstr(statement));
158-
try!(write_counted(formats, |f, buf| buf.write_i16::<BigEndian>(f), buf));
159-
try!(write_counted(values,
160-
|v, buf| write_nullable(|buf| serializer(v, buf), buf),
161-
buf));
162-
try!(write_counted(result_formats, |f, buf| buf.write_i16::<BigEndian>(f), buf));
156+
buf.write_cstr(portal)?;
157+
buf.write_cstr(statement)?;
158+
write_counted(formats, |f, buf| buf.write_i16::<BigEndian>(f), buf)?;
159+
write_counted(values,
160+
|v, buf| write_nullable(|buf| serializer(v, buf), buf),
161+
buf)?;
162+
write_counted(result_formats, |f, buf| buf.write_i16::<BigEndian>(f), buf)?;
163163

164164
Ok(())
165165
})
@@ -175,10 +175,10 @@ fn write_counted<I, T, F, E>(items: I, mut serializer: F, buf: &mut Vec<u8>) ->
175175
buf.extend_from_slice(&[0; 2]);
176176
let mut count = 0;
177177
for item in items {
178-
try!(serializer(item, buf));
178+
serializer(item, buf)?;
179179
count += 1;
180180
}
181-
let count = try!(i16::from_usize(count));
181+
let count = i16::from_usize(count)?;
182182
BigEndian::write_i16(&mut buf[base..], count);
183183

184184
Ok(())
@@ -238,7 +238,7 @@ pub fn describe(variant: u8, name: &str, buf: &mut Vec<u8>) -> io::Result<()> {
238238
pub fn execute(portal: &str, max_rows: i32, buf: &mut Vec<u8>) -> io::Result<()> {
239239
buf.push(b'E');
240240
write_body(buf, |buf| {
241-
try!(buf.write_cstr(portal));
241+
buf.write_cstr(portal)?;
242242
buf.write_i32::<BigEndian>(max_rows).unwrap();
243243
Ok(())
244244
})
@@ -250,9 +250,9 @@ pub fn parse<I>(name: &str, query: &str, param_types: I, buf: &mut Vec<u8>) -> i
250250
{
251251
buf.push(b'P');
252252
write_body(buf, |buf| {
253-
try!(buf.write_cstr(name));
254-
try!(buf.write_cstr(query));
255-
try!(write_counted(param_types, |t, buf| buf.write_u32::<BigEndian>(t), buf));
253+
buf.write_cstr(name)?;
254+
buf.write_cstr(query)?;
255+
write_counted(param_types, |t, buf| buf.write_u32::<BigEndian>(t), buf)?;
256256
Ok(())
257257
})
258258
}
@@ -273,9 +273,9 @@ pub fn query(query: &str, buf: &mut Vec<u8>) -> io::Result<()> {
273273
pub fn sasl_initial_response(mechanism: &str, data: &[u8], buf: &mut Vec<u8>) -> io::Result<()> {
274274
buf.push(b'p');
275275
write_body(buf, |buf| {
276-
try!(buf.write_cstr(mechanism));
277-
let len = try!(i32::from_usize(data.len()));
278-
try!(buf.write_i32::<BigEndian>(len));
276+
buf.write_cstr(mechanism)?;
277+
let len = i32::from_usize(data.len())?;
278+
buf.write_i32::<BigEndian>(len)?;
279279
buf.extend_from_slice(data);
280280
Ok(())
281281
})
@@ -299,8 +299,8 @@ pub fn startup_message<'a, I>(parameters: I, buf: &mut Vec<u8>) -> io::Result<()
299299
write_body(buf, |buf| {
300300
buf.write_i32::<BigEndian>(196608).unwrap();
301301
for (key, value) in parameters {
302-
try!(buf.write_cstr(key.as_ref()));
303-
try!(buf.write_cstr(value.as_ref()));
302+
buf.write_cstr(key.as_ref())?;
303+
buf.write_cstr(value.as_ref())?;
304304
}
305305
buf.push(0);
306306
Ok(())

0 commit comments

Comments
 (0)