Skip to content

Commit c3bdd3a

Browse files
authored
Merge pull request #2665 from topecongiro/issue-2647
Use correct one line width for list attribute
2 parents d8982e5 + 61a401a commit c3bdd3a

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

src/attr.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ impl Rewrite for ast::MetaItem {
247247
config: context.config,
248248
};
249249
let item_str = write_list(&item_vec, &fmt)?;
250-
let one_line_budget = shape.offset_left(name.len())?.sub_width(2)?.width;
250+
// 3 = "()" and "]"
251+
let one_line_budget = shape.offset_left(name.len())?.sub_width(3)?.width;
251252
if context.config.indent_style() == IndentStyle::Visual
252253
|| (!item_str.contains('\n') && item_str.len() <= one_line_budget)
253254
{

tests/source/attrib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,7 @@ pub struct HP(pub u8);
157157

158158
// Long `#[doc = "..."]`
159159
struct A { #[doc = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"] b: i32 }
160+
161+
// #2647
162+
#[cfg(feature = "this_line_is_101_characters_long_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")]
163+
pub fn foo() {}

tests/target/attrib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,9 @@ struct A {
165165
#[doc = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"]
166166
b: i32,
167167
}
168+
169+
// #2647
170+
#[cfg(
171+
feature = "this_line_is_101_characters_long_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
172+
)]
173+
pub fn foo() {}

0 commit comments

Comments
 (0)