File tree Expand file tree Collapse file tree 2 files changed +4
-12
lines changed Expand file tree Collapse file tree 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 {
11101110 use_tree_list,
11111111 // 1 = "{" and "}"
11121112 shape
1113- . offset_left ( 1 )
1113+ . offset_left_opt ( 1 )
11141114 . unknown_error ( ) ?
11151115 . saturating_sub_width ( 1 ) ,
11161116 ) ?
@@ -1160,15 +1160,15 @@ impl Rewrite for UseTree {
11601160 s. clone ( )
11611161 }
11621162 } else {
1163- let Some ( ret) = shape. offset_left ( rewritten_segment. len ( ) ) else {
1163+ let Some ( ret) = shape. offset_left_opt ( rewritten_segment. len ( ) ) else {
11641164 return Err ( RewriteError :: ExceedsMaxWidth {
11651165 configured_width : shape. width ,
11661166 span : span. clone ( ) ,
11671167 } ) ;
11681168 } ;
11691169 // Check that there is a room for the next "{". If not, return an error for
11701170 // 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 ( ) {
11721172 return Err ( RewriteError :: ExceedsMaxWidth {
11731173 configured_width : shape. width ,
11741174 span : span. clone ( ) ,
@@ -1221,7 +1221,7 @@ impl Rewrite for UseTree {
12211221 result. push_str ( "::" ) ;
12221222 // 2 = "::"
12231223 shape = shape
1224- . offset_left ( 2 + segment_str. len ( ) )
1224+ . offset_left_opt ( 2 + segment_str. len ( ) )
12251225 . max_width_error ( shape. width , self . span ( ) ) ?;
12261226 }
12271227 }
Original file line number Diff line number Diff line change @@ -293,14 +293,6 @@ impl Shape {
293293 }
294294 }
295295
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-
304296 pub ( crate ) fn offset_left_opt ( & self , delta : usize ) -> Option < Shape > {
305297 self . add_offset ( delta) . sub_width_opt ( delta)
306298 }
You can’t perform that action at this time.
0 commit comments