diff options
| author | n-salim <53019816+n-salim@users.noreply.github.com> | 2019-09-23 14:12:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 14:12:26 -0700 |
| commit | cd88dae21174f37aa47a45e4b848c4a5ececf19e (patch) | |
| tree | 196ef2334e2f7787737af02f2e78ed53c10fb5a8 /src/libsyntax_ext/deriving/generic/ty.rs | |
| parent | 494d83c89279a955dfb559ded5d5ac2ac06fc255 (diff) | |
| parent | 66bf391c3aabfc77f5f7139fc9e6944f995d574e (diff) | |
Merge pull request #26 from rust-lang/master
Sync to rust-lang/rust master
Diffstat (limited to 'src/libsyntax_ext/deriving/generic/ty.rs')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/ty.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index b341a076752..6ae02a5cab1 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -82,12 +82,12 @@ impl<'a> Path<'a> { .collect(); match self.kind { - PathKind::Global => cx.path_all(span, true, idents, params, Vec::new()), - PathKind::Local => cx.path_all(span, false, idents, params, Vec::new()), + PathKind::Global => cx.path_all(span, true, idents, params), + PathKind::Local => cx.path_all(span, false, idents, params), PathKind::Std => { let def_site = cx.with_def_site_ctxt(DUMMY_SP); idents.insert(0, Ident::new(kw::DollarCrate, def_site)); - cx.path_all(span, false, idents, params, Vec::new()) + cx.path_all(span, false, idents, params) } } @@ -183,7 +183,7 @@ impl<'a> Ty<'a> { } }).collect(); - cx.path_all(span, false, vec![self_ty], params, vec![]) + cx.path_all(span, false, vec![self_ty], params) } Literal(ref p) => p.to_path(cx, span, self_ty, generics), Ptr(..) => cx.span_bug(span, "pointer in a path in generic `derive`"), |
