diff options
| author | bors <bors@rust-lang.org> | 2019-06-19 16:37:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-19 16:37:58 +0000 |
| commit | 5e0c6a69e075d9c7d19e28264bb8941f72ecaf4e (patch) | |
| tree | 340f2e3775fb368108e2fe31ba8b24c9aa521111 /src/libsyntax/ext | |
| parent | e79b2a18a21e6b178d73473bb8fdbf3d18c66051 (diff) | |
| parent | bf6c505c23a1026282cc0518743c9cd6e727c2aa (diff) | |
| download | rust-5e0c6a69e075d9c7d19e28264bb8941f72ecaf4e.tar.gz rust-5e0c6a69e075d9c7d19e28264bb8941f72ecaf4e.zip | |
Auto merge of #61962 - Centril:rollup-y6sg1zw, r=Centril
Rollup of 4 pull requests Successful merges: - #60667 ( Add functions for building raw slices to libcore ) - #61547 (Support `cfg` and `cfg_attr` on generic parameters) - #61861 (Update rustfmt and rls) - #61940 (Make Place::ty iterate) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index be90def0bdd..cfd67575b6f 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -1329,9 +1329,9 @@ impl<'a, 'b> MutVisitor for InvocationCollector<'a, 'b> { } } - fn visit_generic_param(&mut self, param: &mut ast::GenericParam) { - self.cfg.disallow_cfg_on_generic_param(¶m); - noop_visit_generic_param(param, self) + fn visit_generic_params(&mut self, params: &mut Vec<ast::GenericParam>) { + self.cfg.configure_generic_params(params); + noop_visit_generic_params(params, self); } fn visit_attribute(&mut self, at: &mut ast::Attribute) { |
