nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove final_attrs local variable.

Browse Source 
It's no shorter than `ret.attrs()`, and `ret.attrs()` is used multiple
times earlier in the function.
This commit is contained in:
Nicholas Nethercote 2024-07-12 16:03:51 +10:00
parent 757f73f506
commit 1f67cf9e63
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_parse/src/parser/attr_wrapper.rs
View File

@ -313,15 +313,13 @@ impl<'a> Parser<'a> {
*target_tokens = Some(tokens.clone()); *target_tokens = Some(tokens.clone());
} }
let final_attrs = ret.attrs();
// If `capture_cfg` is set and we're inside a recursive call to // If `capture_cfg` is set and we're inside a recursive call to
// `collect_tokens_trailing_token`, then we need to register a replace range // `collect_tokens_trailing_token`, then we need to register a replace range
// if we have `#[cfg]` or `#[cfg_attr]`. This allows us to run eager cfg-expansion // if we have `#[cfg]` or `#[cfg_attr]`. This allows us to run eager cfg-expansion
// on the captured token stream. // on the captured token stream.
if self.capture_cfg if self.capture_cfg
&& matches!(self.capture_state.capturing, Capturing::Yes) && matches!(self.capture_state.capturing, Capturing::Yes)
&& has_cfg_or_cfg_attr(final_attrs) && has_cfg_or_cfg_attr(ret.attrs())
{ {
assert!(!self.break_last_token, "Should not have unglued last token with cfg attr"); assert!(!self.break_last_token, "Should not have unglued last token with cfg attr");
@ -329,7 +327,7 @@ impl<'a> Parser<'a> {
// `target`. If this AST node is inside an item that has `#[derive]`, then this will // `target`. If this AST node is inside an item that has `#[derive]`, then this will
// allow us to cfg-expand this AST node. // allow us to cfg-expand this AST node.
let start_pos = if has_outer_attrs { attrs.start_pos } else { start_pos }; let start_pos = if has_outer_attrs { attrs.start_pos } else { start_pos };
let target = AttrsTarget { attrs: final_attrs.iter().cloned().collect(), tokens }; let target = AttrsTarget { attrs: ret.attrs().iter().cloned().collect(), tokens };
self.capture_state.replace_ranges.push((start_pos..end_pos, Some(target))); self.capture_state.replace_ranges.push((start_pos..end_pos, Some(target)));
self.capture_state.replace_ranges.extend(inner_attr_replace_ranges); self.capture_state.replace_ranges.extend(inner_attr_replace_ranges);
} else if matches!(self.capture_state.capturing, Capturing::No) { } else if matches!(self.capture_state.capturing, Capturing::No) {