bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rearrange TokenTreesReader::parse_token_tree.

Browse source 
`parse_token_tree` is basically a match with four arms: `Eof`,
`OpenDelim`, `CloseDelim`, and "other". It has two call sites, and at
each call site one of the arms is unreachable. It's also not inlined.

This commit removes `parse_token_tree` by splitting it into four
functions and inlining them. This avoids some repeated conditional
tests and also some non-inlined function calls on the hot path.
This commit is contained in:
Nicholas Nethercote 2022-09-21 14:01:39 +10:00
parent f3fafbb006
commit 66e9b1149c
2 changed files with 189 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/rustc_errors/src/lib.rs
View file

@ -63,7 +63,8 @@ pub mod translation;
pub use diagnostic_builder::IntoDiagnostic;
pub use snippet::Style;
pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a, ErrorGuaranteed>>;
pub type PErr<'a> = DiagnosticBuilder<'a, ErrorGuaranteed>;
pub type PResult<'a, T> = Result<T, PErr<'a>>;
// `PResult` is used a lot. Make sure it doesn't unintentionally get bigger.
// (See also the comment on `DiagnosticBuilder`'s `diagnostic` field.)