diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-26 15:05:09 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-26 15:05:09 +0000 |
| commit | 1542797284f5d3ea51d4e44c5c3c0c673d22d79a (patch) | |
| tree | 58b0150a27a6b35000d745807461100786952e93 /crates/hir_expand/src | |
| parent | 0bcd8147ec08db2a94dd2a3068a527ba6c47a4cd (diff) | |
| parent | c784c8ec766edf4c7ab558f71d3f87e6c7c870b9 (diff) | |
Merge #6638
6638: Use named fields in `ExpandResult` r=jonas-schievink a=jonas-schievink
bors r+ :robot:
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir_expand/src')
| -rw-r--r-- | crates/hir_expand/src/db.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs index a9099eb22..3deac1711 100644 --- a/crates/hir_expand/src/db.rs +++ b/crates/hir_expand/src/db.rs | |||
| @@ -242,7 +242,7 @@ fn macro_expand_with_arg( | |||
| 242 | Some(it) => it, | 242 | Some(it) => it, |
| 243 | None => return MacroResult::error("Fail to find macro definition".into()), | 243 | None => return MacroResult::error("Fail to find macro definition".into()), |
| 244 | }; | 244 | }; |
| 245 | let ExpandResult(tt, err) = macro_rules.0.expand(db, lazy_id, ¯o_arg.0); | 245 | let ExpandResult { value: tt, err } = macro_rules.0.expand(db, lazy_id, ¯o_arg.0); |
| 246 | // Set a hard limit for the expanded tt | 246 | // Set a hard limit for the expanded tt |
| 247 | let count = tt.count(); | 247 | let count = tt.count(); |
| 248 | if count > 262144 { | 248 | if count > 262144 { |