From 0c5ccc3166981f7a6fc5b8bf6c9e380c58aae67b Mon Sep 17 00:00:00 2001 From: Tibor Benke Date: Wed, 19 Aug 2015 22:44:55 +0200 Subject: [PATCH] ParserBase: rename new() to with_name() Signed-off-by: Tibor Benke --- src/parsers/base.rs | 2 +- src/parsers/greedy.rs | 2 +- src/parsers/length_checked.rs | 10 +++++----- src/parsers/set.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/parsers/base.rs b/src/parsers/base.rs index ed3f641..a44e975 100644 --- a/src/parsers/base.rs +++ b/src/parsers/base.rs @@ -4,7 +4,7 @@ pub struct ParserBase { } impl ParserBase { - pub fn new(name: String) -> ParserBase { + pub fn with_name(name: String) -> ParserBase { ParserBase { name: name } } diff --git a/src/parsers/greedy.rs b/src/parsers/greedy.rs index 9a6dde9..c00f21e 100644 --- a/src/parsers/greedy.rs +++ b/src/parsers/greedy.rs @@ -9,7 +9,7 @@ pub struct GreedyParser { impl GreedyParser { pub fn new(name: String) -> GreedyParser { - GreedyParser{ base: ParserBase::new(name), + GreedyParser{ base: ParserBase::with_name(name), end_string: None } } diff --git a/src/parsers/length_checked.rs b/src/parsers/length_checked.rs index 721b25e..4d9a44d 100644 --- a/src/parsers/length_checked.rs +++ b/src/parsers/length_checked.rs @@ -8,8 +8,8 @@ pub struct LengthCheckedParserBase { } impl LengthCheckedParserBase { - pub fn new(name: String) -> LengthCheckedParserBase { - LengthCheckedParserBase { base: ParserBase::new(name), + pub fn with_name(name: String) -> LengthCheckedParserBase { + LengthCheckedParserBase { base: ParserBase::with_name(name), min_length: None, max_length: None } } @@ -71,14 +71,14 @@ mod test { #[test] fn test_given_parser_when_the_match_length_is_not_constrained_then_the_match_length_is_ok_in_every_case() { - let base = LengthCheckedParserBase::new("name".to_string()); + let base = LengthCheckedParserBase::with_name("name".to_string()); assert_eq!(base.is_match_length_ok(42), true); assert_eq!(base.is_match_length_ok(1), true); } #[test] fn test_given_parser_when_the_minimum_match_length_is_set_then_the_shorter_matches_are_discarded() { - let mut base = LengthCheckedParserBase::new("name".to_string()); + let mut base = LengthCheckedParserBase::with_name("name".to_string()); base.set_min_length(10); assert_eq!(base.is_match_length_ok(42), true); assert_eq!(base.is_match_length_ok(1), false); @@ -88,7 +88,7 @@ mod test { #[test] fn test_given_parser_when_the_maximum_match_length_is_set_then_the_longer_matches_are_discarded() { - let mut base = LengthCheckedParserBase::new("name".to_string()); + let mut base = LengthCheckedParserBase::with_name("name".to_string()); base.set_max_length(10); assert_eq!(base.is_match_length_ok(42), false); assert_eq!(base.is_match_length_ok(1), true); diff --git a/src/parsers/set.rs b/src/parsers/set.rs index 2c22964..82bdba6 100644 --- a/src/parsers/set.rs +++ b/src/parsers/set.rs @@ -13,7 +13,7 @@ pub struct SetParser { impl SetParser { pub fn new(name: String, set: &str) -> SetParser { SetParser{ character_set: SetParser::create_set_from_str(set), - base: LengthCheckedParserBase::new(name)} + base: LengthCheckedParserBase::with_name(name)} } pub fn from_str(name: &str, set: &str) -> SetParser {