Commit 8166ced

committed

Fix tooling

Signed-off-by: Jonathan Brouwer <jonathantbrouwer@gmail.com>

1 parent 0f0a35d commit 8166cedCopy full SHA for 8166ced

File tree

2 files changed

+21

-34

lines changed

src
- librustdoc/clean
  - mod.rs
- tools/clippy/clippy_lints/src
  - needless_pass_by_value.rs

2 files changed

+21

-34

lines changed

`‎src/librustdoc/clean/mod.rs`

Lines changed: 20 additions & 31 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ use std::mem;`
`36`	`36`
`37`	`37`	`use rustc_ast::token::{Token, TokenKind};`
`38`	`38`	`use rustc_ast::tokenstream::{TokenStream, TokenTree};`
	`39`	`+use rustc_attr_data_structures::{AttributeKind, find_attr};`
`39`	`40`	`use rustc_data_structures::fx::{FxHashMap, FxHashSet, FxIndexMap, FxIndexSet, IndexEntry};`
`40`	`41`	`use rustc_errors::codes::*;`
`41`	`42`	`use rustc_errors::{FatalError, struct_span_code_err};`
`@@ -986,28 +987,17 @@ fn clean_proc_macro<'tcx>(`
`986`	`987`	`kind: MacroKind,`
`987`	`988`	`cx: &mut DocContext<'tcx>,`
`988`	`989`	`) -> ItemKind {`
`989`		`- let attrs = cx.tcx.hir_attrs(item.hir_id());`
`990`		`- if kind == MacroKind::Derive`
`991`		`- && let Some(derive_name) =`
`992`		`- hir_attr_lists(attrs, sym::proc_macro_derive).find_map(\|mi\| mi.ident())`
`993`		`- {`
`994`		`- *name = derive_name.name;`
	`990`	`+ if kind != MacroKind::Derive {`
	`991`	`+ return ProcMacroItem(ProcMacro { kind, helpers: vec![] });`
`995`	`992`	`}`
	`993`	`+ let attrs = cx.tcx.hir_attrs(item.hir_id());`
	`994`	`+ let Some((trait_name, helper_attrs)) = find_attr!(attrs, AttributeKind::ProcMacroDerive { trait_name, helper_attrs, ..} => (*trait_name, helper_attrs))`
	`995`	`+ else {`
	`996`	`+ return ProcMacroItem(ProcMacro { kind, helpers: vec![] });`
	`997`	`+ };`
	`998`	`+ *name = trait_name;`
	`999`	`+ let helpers = helper_attrs.iter().copied().collect();`
`996`	`1000`
`997`		`- let mut helpers = Vec::new();`
`998`		`- for mi in hir_attr_lists(attrs, sym::proc_macro_derive) {`
`999`		`- if !mi.has_name(sym::attributes) {`
`1000`		`- continue;`
`1001`		`- }`
`1002`		`-`
`1003`		`- if let Some(list) = mi.meta_item_list() {`
`1004`		`- for inner_mi in list {`
`1005`		`- if let Some(ident) = inner_mi.ident() {`
`1006`		`- helpers.push(ident.name);`
`1007`		`- }`
`1008`		`- }`
`1009`		`- }`
`1010`		`- }`
`1011`	`1001`	`ProcMacroItem(ProcMacro { kind, helpers })`
`1012`	`1002`	`}`
`1013`	`1003`
`@@ -1020,17 +1010,16 @@ fn clean_fn_or_proc_macro<'tcx>(`
`1020`	`1010`	`cx: &mut DocContext<'tcx>,`
`1021`	`1011`	`) -> ItemKind {`
`1022`	`1012`	`let attrs = cx.tcx.hir_attrs(item.hir_id());`
`1023`		`- let macro_kind = attrs.iter().find_map(\|a\| {`
`1024`		`- if a.has_name(sym::proc_macro) {`
`1025`		`- Some(MacroKind::Bang)`
`1026`		`- } else if a.has_name(sym::proc_macro_derive) {`
`1027`		`- Some(MacroKind::Derive)`
`1028`		`- } else if a.has_name(sym::proc_macro_attribute) {`
`1029`		`- Some(MacroKind::Attr)`
`1030`		`- } else {`
`1031`		`- None`
`1032`		`- }`
`1033`		`- });`
	`1013`	`+ let macro_kind = if find_attr!(attrs, AttributeKind::ProcMacro(..)) {`
	`1014`	`+ Some(MacroKind::Bang)`
	`1015`	`+ } else if find_attr!(attrs, AttributeKind::ProcMacroDerive { .. }) {`
	`1016`	`+ Some(MacroKind::Derive)`
	`1017`	`+ } else if find_attr!(attrs, AttributeKind::ProcMacroAttribute(..)) {`
	`1018`	`+ Some(MacroKind::Attr)`
	`1019`	`+ } else {`
	`1020`	`+ None`
	`1021`	`+ };`
	`1022`	`+`
`1034`	`1023`	`match macro_kind {`
`1035`	`1024`	`Some(kind) => clean_proc_macro(item, name, kind, cx),`
`1036`	`1025`	`None => {`

`‎src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -308,9 +308,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {`
`308`	`308`	`/// Functions marked with these attributes must have the exact signature.`
`309`	`309`	`pub(crate) fn requires_exact_signature(attrs: &[Attribute]) -> bool {`
`310`	`310`	`attrs.iter().any(\|attr\| {`
`311`		`- [sym::proc_macro, sym::proc_macro_attribute, sym::proc_macro_derive]`
`312`		`- .iter()`
`313`		`- .any(\|&allow\| attr.has_name(allow))`
	`311`	`+ attr.is_proc_macro_attr()`
`314`	`312`	`})`
`315`	`313`	`}`
`316`	`314`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8166ced

File tree

2 files changed

2 files changed

`‎src/librustdoc/clean/mod.rs`

`‎src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs`

0 commit comments