@@ -135,14 +135,14 @@ mod tests {
135
135
136
136
#[ test]
137
137
fn basic ( ) -> Result < ( ) > {
138
- let mut safe = SandboxedTTYWriter :: new ( Vec :: new ( ) ) ;
138
+ let mut buffer = Vec :: new ( ) ;
139
+ let mut safe = SandboxedTTYWriter :: new ( & mut buffer) ;
139
140
safe. write_str ( "a\0 b\u{0080} " ) ?;
140
141
safe. write_char ( '\u{0007}' ) ?;
141
142
safe. write ( & [ 0x80 ] ) ?;
142
143
safe. write ( & [ 0xed , 0xa0 , 0x80 , 0xff , 0xfe ] ) ?;
143
- let output = safe. into_inner_writer ( ) ;
144
144
assert_eq ! (
145
- output ,
145
+ buffer ,
146
146
"a\u{2400} b\u{FFFD} \u{2407} \u{FFFD} \u{FFFD} \u{FFFD} \u{FFFD} \u{FFFD} \u{FFFD} " . as_bytes( )
147
147
) ;
148
148
Ok ( ( ) )
@@ -152,25 +152,25 @@ mod tests {
152
152
fn how_many_replacements ( ) -> Result < ( ) > {
153
153
// See https://hsivonen.fi/broken-utf-8/ for background.
154
154
155
- let mut safe = SandboxedTTYWriter :: new ( Vec :: new ( ) ) ;
155
+ let mut buffer = Vec :: new ( ) ;
156
+ let mut safe = SandboxedTTYWriter :: new ( & mut buffer) ;
156
157
safe. write ( & [ 0x80 , 0x80 , 0x80 , 0x80 ] ) ?;
157
- let output = safe. into_inner_writer ( ) ;
158
- assert_eq ! ( output, "\u{FFFD} \u{FFFD} \u{FFFD} \u{FFFD} " . as_bytes( ) ) ;
158
+ assert_eq ! ( buffer, "\u{FFFD} \u{FFFD} \u{FFFD} \u{FFFD} " . as_bytes( ) ) ;
159
159
160
- let mut safe = SandboxedTTYWriter :: new ( Vec :: new ( ) ) ;
160
+ let mut buffer = Vec :: new ( ) ;
161
+ let mut safe = SandboxedTTYWriter :: new ( & mut buffer) ;
161
162
safe. write ( & [ 0xF0 , 0x80 , 0x80 , 0x41 ] ) ?;
162
- let output = safe. into_inner_writer ( ) ;
163
- assert_eq ! ( output, "\u{FFFD} \u{FFFD} \u{FFFD} A" . as_bytes( ) ) ;
163
+ assert_eq ! ( buffer, "\u{FFFD} \u{FFFD} \u{FFFD} A" . as_bytes( ) ) ;
164
164
165
- let mut safe = SandboxedTTYWriter :: new ( Vec :: new ( ) ) ;
165
+ let mut buffer = Vec :: new ( ) ;
166
+ let mut safe = SandboxedTTYWriter :: new ( & mut buffer) ;
166
167
safe. write ( & [ 0xF0 , 0x80 , 0x80 ] ) ?;
167
- let output = safe. into_inner_writer ( ) ;
168
- assert_eq ! ( output, "\u{FFFD} \u{FFFD} \u{FFFD} " . as_bytes( ) ) ;
168
+ assert_eq ! ( buffer, "\u{FFFD} \u{FFFD} \u{FFFD} " . as_bytes( ) ) ;
169
169
170
- let mut safe = SandboxedTTYWriter :: new ( Vec :: new ( ) ) ;
170
+ let mut buffer = Vec :: new ( ) ;
171
+ let mut safe = SandboxedTTYWriter :: new ( & mut buffer) ;
171
172
safe. write ( & [ 0xF4 , 0x80 , 0x80 , 0xC0 ] ) ?;
172
- let output = safe. into_inner_writer ( ) ;
173
- assert_eq ! ( output, "\u{FFFD} \u{FFFD} " . as_bytes( ) ) ;
173
+ assert_eq ! ( buffer, "\u{FFFD} \u{FFFD} " . as_bytes( ) ) ;
174
174
175
175
Ok ( ( ) )
176
176
}
0 commit comments