diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-04-02 23:56:09 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2025-04-03 00:18:04 +0300 |
| commit | fef3cf0d071e5b771734be4380bdccebfee60990 (patch) | |
| tree | bb1777de1f0b26f82653129a49f55827a89fcf6c /compiler/rustc_middle/src | |
| parent | 4f0de4c81d80121ac7b576bc68d8016064f4d261 (diff) | |
| download | rust-fef3cf0d071e5b771734be4380bdccebfee60990.tar.gz rust-fef3cf0d071e5b771734be4380bdccebfee60990.zip | |
hygiene: Avoid recursion in syntax context decoding
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/query/on_disk_cache.rs | 3 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/ty/parameterized.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/query/on_disk_cache.rs b/compiler/rustc_middle/src/query/on_disk_cache.rs index 14e3ce8bef6..c6ecc679b7b 100644 --- a/compiler/rustc_middle/src/query/on_disk_cache.rs +++ b/compiler/rustc_middle/src/query/on_disk_cache.rs @@ -16,7 +16,8 @@ use rustc_serialize::opaque::{FileEncodeResult, FileEncoder, IntEncodedWithFixed use rustc_serialize::{Decodable, Decoder, Encodable, Encoder}; use rustc_session::Session; use rustc_span::hygiene::{ - ExpnId, HygieneDecodeContext, HygieneEncodeContext, SyntaxContext, SyntaxContextData, + ExpnId, HygieneDecodeContext, HygieneEncodeContext, SyntaxContext, + SyntaxContextDataNonRecursive as SyntaxContextData, }; use rustc_span::source_map::Spanned; use rustc_span::{ diff --git a/compiler/rustc_middle/src/ty/parameterized.rs b/compiler/rustc_middle/src/ty/parameterized.rs index 61b35b33a09..b56e0862692 100644 --- a/compiler/rustc_middle/src/ty/parameterized.rs +++ b/compiler/rustc_middle/src/ty/parameterized.rs @@ -113,7 +113,7 @@ trivially_parameterized_over_tcx! { rustc_span::Span, rustc_span::Symbol, rustc_span::def_id::DefPathHash, - rustc_span::hygiene::SyntaxContextData, + rustc_span::hygiene::SyntaxContextDataNonRecursive, rustc_span::Ident, rustc_type_ir::Variance, rustc_hir::Attribute, |