Skip to content

Commit bf5d6ae

Browse files
committed
rustfmt: fix
1 parent 4dd28ed commit bf5d6ae

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎src/tools/rustfmt/src/items.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,15 +1558,15 @@ fn format_tuple_struct(
15581558
.snippet_provider
15591559
.span_after(mk_sp(lo, span.hi()), "(")
15601560
} else {
1561-
fields[0].span.lo()
1561+
fields[0].span().lo()
15621562
};
15631563
let body_hi = if fields.is_empty() {
15641564
context
15651565
.snippet_provider
15661566
.span_after(mk_sp(body_lo, span.hi()), ")")
15671567
} else {
15681568
// This is a dirty hack to work around a missing `)` from the span of the last field.
1569-
let last_arg_span = fields[fields.len() - 1].span;
1569+
let last_arg_span = fields[fields.len() - 1].span();
15701570
context
15711571
.snippet_provider
15721572
.opt_span_after(mk_sp(last_arg_span.hi(), span.hi()), ")")
@@ -1874,9 +1874,9 @@ pub(crate) fn rewrite_struct_field(
18741874
let attrs_str = field.attrs.rewrite(context, shape)?;
18751875
let attrs_extendable = field.ident.is_none() && is_attributes_extendable(&attrs_str);
18761876
let missing_span = if field.attrs.is_empty() {
1877-
mk_sp(field.span.lo(), field.span.lo())
1877+
mk_sp(field.span().lo(), field.span().lo())
18781878
} else {
1879-
mk_sp(field.attrs.last().unwrap().span.hi(), field.span.lo())
1879+
mk_sp(field.attrs.last().unwrap().span.hi(), field.span().lo())
18801880
};
18811881
let mut spacing = String::from(if field.ident.is_some() {
18821882
type_annotation_spacing.1

‎src/tools/rustfmt/src/spanned.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl Spanned for ast::GenericParam {
143143

144144
impl Spanned for ast::FieldDef {
145145
fn span(&self) -> Span {
146-
span_with_attrs_lo_hi!(self, self.span.lo(), self.ty.span.hi())
146+
span_with_attrs_lo_hi!(self, self.span().lo(), self.ty.span.hi())
147147
}
148148
}
149149

‎src/tools/rustfmt/src/vertical.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ impl AlignedItem for ast::FieldDef {
4545
fn rewrite_prefix(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
4646
let attrs_str = self.attrs.rewrite(context, shape)?;
4747
let missing_span = if self.attrs.is_empty() {
48-
mk_sp(self.span.lo(), self.span.lo())
48+
mk_sp(self.span().lo(), self.span().lo())
4949
} else {
50-
mk_sp(self.attrs.last().unwrap().span.hi(), self.span.lo())
50+
mk_sp(self.attrs.last().unwrap().span.hi(), self.span().lo())
5151
};
5252
let attrs_extendable = self.ident.is_none() && is_attributes_extendable(&attrs_str);
5353
rewrite_struct_field_prefix(context, self).and_then(|field_str| {

0 commit comments

Comments
 (0)