From cbf3d58a703d3f2873fd63ce244938142f7ec137 Mon Sep 17 00:00:00 2001 From: trivernis Date: Wed, 29 Jul 2020 19:58:21 +0200 Subject: [PATCH] Fix visibility of modules --- src/lib.rs | 20 ++++++++++---------- src/tapemachine.rs | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4ce0679..e4d7eb7 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -mod tapemachine; +pub mod tapemachine; #[cfg(test)] mod tests { @@ -10,7 +10,7 @@ mod tests { #[test] fn it_returns_the_next_char() { let mut ctm = CharTapeMachine::new(TEST_STRING.chars().collect()); - let mut test_chars: Vec = TEST_STRING.chars().collect(); + let test_chars: Vec = TEST_STRING.chars().collect(); let mut next = ctm.next_char().unwrap(); assert_eq!(next, *test_chars.get(1).unwrap()); @@ -18,9 +18,9 @@ mod tests { next = ctm.next_char().unwrap(); assert_eq!(next, *test_chars.get(2).unwrap()); - next = ctm.next_char().unwrap(); - next = ctm.next_char().unwrap(); - next = ctm.next_char().unwrap(); + let _ = ctm.next_char().unwrap(); + let _ = ctm.next_char().unwrap(); + let _ = ctm.next_char().unwrap(); next = ctm.next_char().unwrap(); assert_eq!(next, *test_chars.get(6).unwrap()); } @@ -28,7 +28,7 @@ mod tests { #[test] fn it_rewinds() { let mut ctm = CharTapeMachine::new(TEST_STRING.chars().collect()); - let mut test_chars: Vec = TEST_STRING.chars().collect(); + let test_chars: Vec = TEST_STRING.chars().collect(); ctm.next_char().unwrap(); ctm.next_char().unwrap(); @@ -41,7 +41,7 @@ mod tests { #[test] fn it_seeks() { let mut ctm = CharTapeMachine::new(TEST_STRING.chars().collect()); - let mut test_chars: Vec = TEST_STRING.chars().collect(); + let test_chars: Vec = TEST_STRING.chars().collect(); assert_eq!(ctm.next_char(), Some(*test_chars.get(1).unwrap())); ctm.seek_one().unwrap(); @@ -55,11 +55,11 @@ mod tests { fn it_asserts_chars() -> TapeResult<()> { let mut ctm = CharTapeMachine::new(TEST_STRING.chars().collect()); ctm.assert_any(&['A', 'B', 'T'], None)?; - ctm.seek_one(); + ctm.seek_one().unwrap(); ctm.assert_char(&'E', None)?; - ctm.seek_one(); + ctm.seek_one().unwrap(); ctm.assert_sequence(&['S', 'T', ' '], None)?; - ctm.seek_one(); + ctm.seek_one().unwrap(); ctm.assert_any_sequence(&[&['C'], &['A'], &['A', 'B'], &['S', 'T', 'R']], None)?; if let Ok(_) = ctm.assert_any_sequence(&[&['C'], &['A'], &['A', 'B'], &['S', 'T', 'R']], None) { diff --git a/src/tapemachine.rs b/src/tapemachine.rs index 3c2eaad..97e63e1 100644 --- a/src/tapemachine.rs +++ b/src/tapemachine.rs @@ -245,7 +245,7 @@ impl CharTapeMachine { /// Returns the string until it encounters a given sequence or rewinds with error /// if it encounters an err sequence - fn get_string_until_sequence( + pub fn get_string_until_sequence( &mut self, until: &[&[char]], err_at: &[&[char]],