@@ -11,15 +11,15 @@ use std::{
11
11
12
12
use crate :: app_state:: CheckProgress ;
13
13
14
- pub struct MaxLenWriter < ' a , ' b > {
15
- pub stdout : & ' a mut StdoutLock < ' b > ,
14
+ pub struct MaxLenWriter < ' a , ' lock > {
15
+ pub stdout : & ' a mut StdoutLock < ' lock > ,
16
16
len : usize ,
17
17
max_len : usize ,
18
18
}
19
19
20
- impl < ' a , ' b > MaxLenWriter < ' a , ' b > {
20
+ impl < ' a , ' lock > MaxLenWriter < ' a , ' lock > {
21
21
#[ inline]
22
- pub fn new ( stdout : & ' a mut StdoutLock < ' b > , max_len : usize ) -> Self {
22
+ pub fn new ( stdout : & ' a mut StdoutLock < ' lock > , max_len : usize ) -> Self {
23
23
Self {
24
24
stdout,
25
25
len : 0 ,
@@ -34,13 +34,13 @@ impl<'a, 'b> MaxLenWriter<'a, 'b> {
34
34
}
35
35
}
36
36
37
- pub trait CountedWrite < ' a > {
37
+ pub trait CountedWrite < ' lock > {
38
38
fn write_ascii ( & mut self , ascii : & [ u8 ] ) -> io:: Result < ( ) > ;
39
39
fn write_str ( & mut self , unicode : & str ) -> io:: Result < ( ) > ;
40
- fn stdout ( & mut self ) -> & mut StdoutLock < ' a > ;
40
+ fn stdout ( & mut self ) -> & mut StdoutLock < ' lock > ;
41
41
}
42
42
43
- impl < ' a , ' b > CountedWrite < ' b > for MaxLenWriter < ' a , ' b > {
43
+ impl < ' lock > CountedWrite < ' lock > for MaxLenWriter < ' _ , ' lock > {
44
44
fn write_ascii ( & mut self , ascii : & [ u8 ] ) -> io:: Result < ( ) > {
45
45
let n = ascii. len ( ) . min ( self . max_len . saturating_sub ( self . len ) ) ;
46
46
if n > 0 {
@@ -65,7 +65,7 @@ impl<'a, 'b> CountedWrite<'b> for MaxLenWriter<'a, 'b> {
65
65
}
66
66
67
67
#[ inline]
68
- fn stdout ( & mut self ) -> & mut StdoutLock < ' b > {
68
+ fn stdout ( & mut self ) -> & mut StdoutLock < ' lock > {
69
69
self . stdout
70
70
}
71
71
}
@@ -87,17 +87,17 @@ impl<'a> CountedWrite<'a> for StdoutLock<'a> {
87
87
}
88
88
}
89
89
90
- pub struct CheckProgressVisualizer < ' a , ' b > {
91
- stdout : & ' a mut StdoutLock < ' b > ,
90
+ pub struct CheckProgressVisualizer < ' a , ' lock > {
91
+ stdout : & ' a mut StdoutLock < ' lock > ,
92
92
n_cols : usize ,
93
93
}
94
94
95
- impl < ' a , ' b > CheckProgressVisualizer < ' a , ' b > {
95
+ impl < ' a , ' lock > CheckProgressVisualizer < ' a , ' lock > {
96
96
const CHECKING_COLOR : Color = Color :: Blue ;
97
97
const DONE_COLOR : Color = Color :: Green ;
98
98
const PENDING_COLOR : Color = Color :: Red ;
99
99
100
- pub fn build ( stdout : & ' a mut StdoutLock < ' b > , term_width : u16 ) -> io:: Result < Self > {
100
+ pub fn build ( stdout : & ' a mut StdoutLock < ' lock > , term_width : u16 ) -> io:: Result < Self > {
101
101
clear_terminal ( stdout) ?;
102
102
stdout. write_all ( "Checking all exercises…\n " . as_bytes ( ) ) ?;
103
103
0 commit comments