@@ -4,7 +4,7 @@ use std::io::{BufRead, BufReader, BufWriter};
4
4
use std:: str:: FromStr ;
5
5
6
6
#[ allow( non_camel_case_types) ]
7
- #[ derive( Debug , PartialEq , Clone , Copy ) ]
7
+ #[ derive( Debug , PartialEq , Eq , Clone , Copy ) ]
8
8
pub enum LineFeed {
9
9
LF ,
10
10
LF_CRLF ,
@@ -20,15 +20,15 @@ impl FromStr for LineFeed {
20
20
type Err = ( ) ;
21
21
fn from_str ( s : & str ) -> Result < Self , Self :: Err > {
22
22
match s {
23
- "LF" => return Result :: Ok ( LineFeed :: LF ) ,
24
- "LF_CRLF" => return Result :: Ok ( LineFeed :: LF_CRLF ) ,
23
+ "LF" => Result :: Ok ( LineFeed :: LF ) ,
24
+ "LF_CRLF" => Result :: Ok ( LineFeed :: LF_CRLF ) ,
25
25
_ => Err ( ( ) ) ,
26
26
}
27
27
}
28
28
}
29
29
30
30
pub fn reader ( file_name : & str ) -> BufReader < File > {
31
- let file = match File :: open ( & file_name) {
31
+ let file = match File :: open ( file_name) {
32
32
Ok ( file) => file,
33
33
Err ( e) => {
34
34
panic ! ( "An error occurred while opening file {}: {}" , file_name, e) ;
@@ -45,7 +45,7 @@ pub fn read_line_with_bytes(reader: &mut dyn BufRead, bytes: usize, feed: LineFe
45
45
match read_line_with_linefeed ( reader, & mut buf, feed) {
46
46
Ok ( 0 ) => break ,
47
47
Ok ( n) => {
48
- if !buf. ends_with ( " \n " ) {
48
+ if !buf. ends_with ( '\n' ) {
49
49
buf += "\n " ;
50
50
}
51
51
current_size += n;
@@ -66,7 +66,7 @@ pub fn read_line_with_bytes(reader: &mut dyn BufRead, bytes: usize, feed: LineFe
66
66
}
67
67
68
68
pub fn writer ( file_name : & str ) -> BufWriter < File > {
69
- let file = match File :: create ( & file_name) {
69
+ let file = match File :: create ( file_name) {
70
70
Ok ( file) => file,
71
71
Err ( e) => {
72
72
panic ! ( "An error occurred while creating file {}: {}" , file_name, e) ;
@@ -75,7 +75,7 @@ pub fn writer(file_name: &str) -> BufWriter<File> {
75
75
BufWriter :: new ( file)
76
76
}
77
77
78
- pub fn read_line_with_linefeed ( reader : & mut dyn BufRead , buf : & mut String , feed : LineFeed ) -> std:: io :: Result < usize > {
78
+ pub fn read_line_with_linefeed ( reader : & mut dyn BufRead , buf : & mut String , feed : LineFeed ) -> std:: result :: Result < usize , std :: io :: Error > {
79
79
let mut sz = 0 ;
80
80
loop {
81
81
let mut tbuf = String :: new ( ) ;
@@ -91,7 +91,7 @@ pub fn read_line_with_linefeed(reader: &mut dyn BufRead, buf: &mut String, feed:
91
91
Err ( e) => return Err ( e) ,
92
92
}
93
93
}
94
- return Ok ( sz) ;
94
+ Ok ( sz)
95
95
}
96
96
97
97
#[ test]
0 commit comments