mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass ExpnData by reference.

Browse Source
This commit is contained in:
Camille GILLOT 2021-07-12 16:56:13 +02:00
parent a51b131fd1
commit 0f8573e57b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_middle/src/ty/query/on_disk_cache.rs
View File

@ -372,7 +372,7 @@ pub fn serialize<'tcx>(
|encoder, expn_id, data, hash| -> FileEncodeResult { |encoder, expn_id, data, hash| -> FileEncodeResult {
if expn_id.krate == LOCAL_CRATE { if expn_id.krate == LOCAL_CRATE {
let pos = AbsoluteBytePos::new(encoder.position()); let pos = AbsoluteBytePos::new(encoder.position());
encoder.encode_tagged(TAG_EXPN_DATA, &data)?; encoder.encode_tagged(TAG_EXPN_DATA, data)?;
expn_data.insert(hash, pos); expn_data.insert(hash, pos);
} else { } else {
foreign_expn_data.insert(hash, expn_id.local_id.as_u32()); foreign_expn_data.insert(hash, expn_id.local_id.as_u32());

6
compiler/rustc_span/src/hygiene.rs
View File

@ -1142,7 +1142,7 @@ pub fn encode<T, R>(
&self, &self,
encoder: &mut T, encoder: &mut T,
mut encode_ctxt: impl FnMut(&mut T, u32, &SyntaxContextData) -> Result<(), R>, mut encode_ctxt: impl FnMut(&mut T, u32, &SyntaxContextData) -> Result<(), R>,
mut encode_expn: impl FnMut(&mut T, ExpnId, ExpnData, ExpnHash) -> Result<(), R>, mut encode_expn: impl FnMut(&mut T, ExpnId, &ExpnData, ExpnHash) -> Result<(), R>,
) -> Result<(), R> { ) -> Result<(), R> {
// When we serialize a `SyntaxContextData`, we may end up serializing // When we serialize a `SyntaxContextData`, we may end up serializing
// a `SyntaxContext` that we haven't seen before // a `SyntaxContext` that we haven't seen before
@ -1344,7 +1344,7 @@ fn for_all_ctxts_in<E, F: FnMut(u32, SyntaxContext, &SyntaxContextData) -> Resul
fn for_all_expns_in<E>( fn for_all_expns_in<E>(
expns: impl Iterator<Item = ExpnId>, expns: impl Iterator<Item = ExpnId>,
mut f: impl FnMut(ExpnId, ExpnData, ExpnHash) -> Result<(), E>, mut f: impl FnMut(ExpnId, &ExpnData, ExpnHash) -> Result<(), E>,
) -> Result<(), E> { ) -> Result<(), E> {
let all_data: Vec<_> = HygieneData::with(|data| { let all_data: Vec<_> = HygieneData::with(|data| {
expns expns
@ -1352,7 +1352,7 @@ fn for_all_expns_in<E>(
.collect() .collect()
}); });
for (expn, data, hash) in all_data.into_iter() { for (expn, data, hash) in all_data.into_iter() {
f(expn, data, hash)?; f(expn, &data, hash)?;
} }
Ok(()) Ok(())
} }