Skip to content

Commit

Permalink
Pass ExpnData by reference.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjgillot committed Jul 17, 2021
1 parent a51b131 commit 0f8573e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_middle/src/ty/query/on_disk_cache.rs
Expand Up @@ -372,7 +372,7 @@ impl<'sess> OnDiskCache<'sess> {
|encoder, expn_id, data, hash| -> FileEncodeResult {
if expn_id.krate == LOCAL_CRATE {
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);
} else {
foreign_expn_data.insert(hash, expn_id.local_id.as_u32());
Expand Down
6 changes: 3 additions & 3 deletions compiler/rustc_span/src/hygiene.rs
Expand Up @@ -1142,7 +1142,7 @@ impl HygieneEncodeContext {
&self,
encoder: &mut T,
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> {
// When we serialize a `SyntaxContextData`, we may end up serializing
// a `SyntaxContext` that we haven't seen before
Expand Down Expand Up @@ -1344,15 +1344,15 @@ fn for_all_ctxts_in<E, F: FnMut(u32, SyntaxContext, &SyntaxContextData) -> Resul

fn for_all_expns_in<E>(
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> {
let all_data: Vec<_> = HygieneData::with(|data| {
expns
.map(|expn| (expn, data.expn_data(expn).clone(), data.expn_hash(expn).clone()))
.collect()
});
for (expn, data, hash) in all_data.into_iter() {
f(expn, data, hash)?;
f(expn, &data, hash)?;
}
Ok(())
}
Expand Down

0 comments on commit 0f8573e

Please sign in to comment.