Skip to content

Commit 3f11c4b

Browse files
committed
Updated rustfmt to account for changes from rust-lang/rust#44766
1 parent 560b054 commit 3f11c4b

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

src/items.rs

+10-5
Original file line numberDiff line numberDiff line change
@@ -184,25 +184,29 @@ impl<'a> FnSig<'a> {
184184
}
185185
}
186186

187-
pub fn from_method_sig(method_sig: &'a ast::MethodSig) -> FnSig {
187+
pub fn from_method_sig(
188+
method_sig: &'a ast::MethodSig,
189+
generics: &'a ast::Generics,
190+
) -> FnSig<'a> {
188191
FnSig {
189192
unsafety: method_sig.unsafety,
190193
constness: method_sig.constness.node,
191194
defaultness: ast::Defaultness::Final,
192195
abi: method_sig.abi,
193196
decl: &*method_sig.decl,
194-
generics: &method_sig.generics,
197+
generics: generics,
195198
visibility: ast::Visibility::Inherited,
196199
}
197200
}
198201

199202
pub fn from_fn_kind(
200203
fn_kind: &'a visit::FnKind,
204+
generics: &'a ast::Generics,
201205
decl: &'a ast::FnDecl,
202206
defualtness: ast::Defaultness,
203207
) -> FnSig<'a> {
204208
match *fn_kind {
205-
visit::FnKind::ItemFn(_, generics, unsafety, constness, abi, visibility, _) => FnSig {
209+
visit::FnKind::ItemFn(_, unsafety, constness, abi, visibility, _) => FnSig {
206210
decl: decl,
207211
generics: generics,
208212
abi: abi,
@@ -212,7 +216,7 @@ impl<'a> FnSig<'a> {
212216
visibility: visibility.clone(),
213217
},
214218
visit::FnKind::Method(_, ref method_sig, vis, _) => {
215-
let mut fn_sig = FnSig::from_method_sig(method_sig);
219+
let mut fn_sig = FnSig::from_method_sig(method_sig, generics);
216220
fn_sig.defaultness = defualtness;
217221
if let Some(vis) = vis {
218222
fn_sig.visibility = vis.clone();
@@ -338,6 +342,7 @@ impl<'a> FmtVisitor<'a> {
338342
indent: Indent,
339343
ident: ast::Ident,
340344
sig: &ast::MethodSig,
345+
generics: &ast::Generics,
341346
span: Span,
342347
) -> Option<String> {
343348
// Drop semicolon or it will be interpreted as comment.
@@ -348,7 +353,7 @@ impl<'a> FmtVisitor<'a> {
348353
&context,
349354
indent,
350355
ident,
351-
&FnSig::from_method_sig(sig),
356+
&FnSig::from_method_sig(sig, generics),
352357
span,
353358
false,
354359
false,

src/visitor.rs

+10-13
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ impl<'a> FmtVisitor<'a> {
229229
fn visit_fn(
230230
&mut self,
231231
fk: visit::FnKind,
232+
generics: &ast::Generics,
232233
fd: &ast::FnDecl,
233234
s: Span,
234235
_: ast::NodeId,
@@ -238,12 +239,12 @@ impl<'a> FmtVisitor<'a> {
238239
let indent = self.block_indent;
239240
let block;
240241
let rewrite = match fk {
241-
visit::FnKind::ItemFn(ident, _, _, _, _, _, b) => {
242+
visit::FnKind::ItemFn(ident, _, _, _, _, b) => {
242243
block = b;
243244
self.rewrite_fn(
244245
indent,
245246
ident,
246-
&FnSig::from_fn_kind(&fk, fd, defaultness),
247+
&FnSig::from_fn_kind(&fk, generics, fd, defaultness),
247248
mk_sp(s.lo(), b.span.lo()),
248249
b,
249250
)
@@ -253,7 +254,7 @@ impl<'a> FmtVisitor<'a> {
253254
self.rewrite_fn(
254255
indent,
255256
ident,
256-
&FnSig::from_fn_kind(&fk, fd, defaultness),
257+
&FnSig::from_fn_kind(&fk, generics, fd, defaultness),
257258
mk_sp(s.lo(), b.span.lo()),
258259
b,
259260
)
@@ -411,15 +412,8 @@ impl<'a> FmtVisitor<'a> {
411412
}
412413
ast::ItemKind::Fn(ref decl, unsafety, constness, abi, ref generics, ref body) => {
413414
self.visit_fn(
414-
visit::FnKind::ItemFn(
415-
item.ident,
416-
generics,
417-
unsafety,
418-
constness,
419-
abi,
420-
&item.vis,
421-
body,
422-
),
415+
visit::FnKind::ItemFn(item.ident, unsafety, constness, abi, &item.vis, body),
416+
generics,
423417
decl,
424418
item.span,
425419
item.id,
@@ -490,12 +484,14 @@ impl<'a> FmtVisitor<'a> {
490484
}
491485
ast::TraitItemKind::Method(ref sig, None) => {
492486
let indent = self.block_indent;
493-
let rewrite = self.rewrite_required_fn(indent, ti.ident, sig, ti.span);
487+
let rewrite =
488+
self.rewrite_required_fn(indent, ti.ident, sig, &ti.generics, ti.span);
494489
self.push_rewrite(ti.span, rewrite);
495490
}
496491
ast::TraitItemKind::Method(ref sig, Some(ref body)) => {
497492
self.visit_fn(
498493
visit::FnKind::Method(ti.ident, sig, None, body),
494+
&ti.generics,
499495
&sig.decl,
500496
ti.span,
501497
ti.id,
@@ -531,6 +527,7 @@ impl<'a> FmtVisitor<'a> {
531527
ast::ImplItemKind::Method(ref sig, ref body) => {
532528
self.visit_fn(
533529
visit::FnKind::Method(ii.ident, sig, Some(&ii.vis), body),
530+
&ii.generics,
534531
&sig.decl,
535532
ii.span,
536533
ii.id,

0 commit comments

Comments
 (0)