summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <mathstuf@gmail.com>2020-04-08 22:42:51 -0400
committerBen Boeckel <mathstuf@gmail.com>2020-04-09 10:32:09 -0400
commit463bac13f984892f041a13184e1a651d00cf3af8 (patch)
tree498269b302e161e78a21c1e92b3260886774a343
parent909f0ce9ee9bdf5bc8bc0d787e30faf8e1dd480d (diff)
untry: replace try! macro usage with the ? operator
-rw-r--r--src/component.rs4
-rw-r--r--src/parser.rs20
2 files changed, 12 insertions, 12 deletions
diff --git a/src/component.rs b/src/component.rs
index 8330d18..f87e992 100644
--- a/src/component.rs
+++ b/src/component.rs
@@ -79,7 +79,7 @@ impl FromStr for Component {
/// Parse exactly one component. Trailing data generates errors.
pub fn parse_component(s: &str) -> Result<Component> {
- let (rv, new_s) = try!(read_component(s));
+ let (rv, new_s) = read_component(s)?;
if !new_s.is_empty() {
let s = format!("Trailing data: `{}`", new_s);
return Err(VObjectErrorKind::ParserError(s));
@@ -91,7 +91,7 @@ pub fn parse_component(s: &str) -> Result<Component> {
/// Parse one component and return the rest of the string.
pub fn read_component(s: &str) -> Result<(Component, &str)> {
let mut parser = Parser::new(s);
- let rv = try!(parser.consume_component());
+ let rv = parser.consume_component()?;
let new_s = if parser.eof() {
""
} else {
diff --git a/src/parser.rs b/src/parser.rs
index 808bc62..d46058a 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -108,7 +108,7 @@ impl<'s> Parser<'s> {
fn sloppy_terminate_line(&mut self) -> Result<()> {
if !self.eof() {
- try!(self.consume_eol());
+ self.consume_eol()?;
while let Ok(_) = self.consume_eol() {}
};
@@ -152,13 +152,13 @@ impl<'s> Parser<'s> {
pub fn consume_property(&mut self) -> Result<Property> {
let group = self.consume_property_group().ok();
- let name = try!(self.consume_property_name());
+ let name = self.consume_property_name()?;
let params = self.consume_params();
- try!(self.assert_char(':'));
+ self.assert_char(':')?;
self.consume_char();
- let value = try!(self.consume_property_value());
+ let value = self.consume_property_value()?;
Ok(Property {
name: name,
@@ -198,7 +198,7 @@ impl<'s> Parser<'s> {
fn consume_property_value(&mut self) -> Result<String> {
let rv = self.consume_while(|x| x != '\r' && x != '\n');
- try!(self.sloppy_terminate_line());
+ self.sloppy_terminate_line()?;
Ok(rv)
}
@@ -218,7 +218,7 @@ impl<'s> Parser<'s> {
if self.consume_only_char('"') {
let rv = self.consume_while(qsafe);
- try!(self.assert_char('"'));
+ self.assert_char('"')?;
self.consume_char();
Ok(rv)
} else {
@@ -227,7 +227,7 @@ impl<'s> Parser<'s> {
}
fn consume_param(&mut self) -> Result<(String, String)> {
- let name = try!(self.consume_param_name());
+ let name = self.consume_param_name()?;
let start_pos = self.pos;
let value = if self.consume_only_char('=') {
match self.consume_param_value() {
@@ -254,7 +254,7 @@ impl<'s> Parser<'s> {
pub fn consume_component(&mut self) -> Result<Component> {
let start_pos = self.pos;
- let mut property = try!(self.consume_property());
+ let mut property = self.consume_property()?;
if property.name != "BEGIN" {
self.pos = start_pos;
return Err(VObjectErrorKind::ParserError("Expected BEGIN tag.".to_owned()));
@@ -265,10 +265,10 @@ impl<'s> Parser<'s> {
loop {
let previous_pos = self.pos;
- property = try!(self.consume_property());
+ property = self.consume_property()?;
if property.name == "BEGIN" {
self.pos = previous_pos;
- component.subcomponents.push(try!(self.consume_component()));
+ component.subcomponents.push(self.consume_component()?);
} else if property.name == "END" {
if property.raw_value != component.name {
self.pos = start_pos;