File tree 2 files changed +4
-12
lines changed 2 files changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -1110,7 +1110,7 @@ impl Rewrite for UseSegment {
1110
1110
use_tree_list,
1111
1111
// 1 = "{" and "}"
1112
1112
shape
1113
- . offset_left ( 1 )
1113
+ . offset_left_opt ( 1 )
1114
1114
. unknown_error ( ) ?
1115
1115
. saturating_sub_width ( 1 ) ,
1116
1116
) ?
@@ -1160,15 +1160,15 @@ impl Rewrite for UseTree {
1160
1160
s. clone ( )
1161
1161
}
1162
1162
} else {
1163
- let Some ( ret) = shape. offset_left ( rewritten_segment. len ( ) ) else {
1163
+ let Some ( ret) = shape. offset_left_opt ( rewritten_segment. len ( ) ) else {
1164
1164
return Err ( RewriteError :: ExceedsMaxWidth {
1165
1165
configured_width : shape. width ,
1166
1166
span : span. clone ( ) ,
1167
1167
} ) ;
1168
1168
} ;
1169
1169
// Check that there is a room for the next "{". If not, return an error for
1170
1170
// retry with newline.
1171
- if ret. offset_left ( reserved_room_for_brace) . is_none ( ) {
1171
+ if ret. offset_left_opt ( reserved_room_for_brace) . is_none ( ) {
1172
1172
return Err ( RewriteError :: ExceedsMaxWidth {
1173
1173
configured_width : shape. width ,
1174
1174
span : span. clone ( ) ,
@@ -1221,7 +1221,7 @@ impl Rewrite for UseTree {
1221
1221
result. push_str ( "::" ) ;
1222
1222
// 2 = "::"
1223
1223
shape = shape
1224
- . offset_left ( 2 + segment_str. len ( ) )
1224
+ . offset_left_opt ( 2 + segment_str. len ( ) )
1225
1225
. max_width_error ( shape. width , self . span ( ) ) ?;
1226
1226
}
1227
1227
}
Original file line number Diff line number Diff line change @@ -293,14 +293,6 @@ impl Shape {
293
293
}
294
294
}
295
295
296
- pub ( crate ) fn shrink_left ( & self , width : usize ) -> Option < Shape > {
297
- Some ( Shape {
298
- width : self . width . checked_sub ( width) ?,
299
- indent : self . indent + width,
300
- offset : self . offset + width,
301
- } )
302
- }
303
-
304
296
pub ( crate ) fn offset_left_opt ( & self , delta : usize ) -> Option < Shape > {
305
297
self . add_offset ( delta) . sub_width_opt ( delta)
306
298
}
You can’t perform that action at this time.
0 commit comments