diff options
| author | bors <bors@rust-lang.org> | 2023-04-21 19:43:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-21 19:43:11 +0000 |
| commit | fec9adcdbc21469ef105162cc8cabf81c72d06be (patch) | |
| tree | 64187970c869f390de938eb05ae0c8f22e5f3752 /compiler/rustc_query_impl/src | |
| parent | fa4cc63a6bd6f32903269e52b8f59b284d0e76c4 (diff) | |
| parent | 482e407a1f4a2c67e7fe98682612b78b35025e7a (diff) | |
| download | rust-fec9adcdbc21469ef105162cc8cabf81c72d06be.tar.gz rust-fec9adcdbc21469ef105162cc8cabf81c72d06be.zip | |
Auto merge of #110648 - Dylan-DPC:rollup-em3ovcq, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #110333 (rustc_metadata: Split `children` into multiple tables) - #110501 (rustdoc: fix ICE from rustc_resolve and librustdoc parse divergence) - #110608 (Specialize some `io::Read` and `io::Write` methods for `VecDeque<u8>` and `&[u8]`) - #110632 (Panic instead of truncating if the incremental on-disk cache is too big) - #110633 (More `mem::take` in `library`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_query_impl/src')
| -rw-r--r-- | compiler/rustc_query_impl/src/on_disk_cache.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_query_impl/src/on_disk_cache.rs b/compiler/rustc_query_impl/src/on_disk_cache.rs index 40869fdc467..c05323c2d6c 100644 --- a/compiler/rustc_query_impl/src/on_disk_cache.rs +++ b/compiler/rustc_query_impl/src/on_disk_cache.rs @@ -300,7 +300,7 @@ impl<'sess> rustc_middle::ty::OnDiskCache<'sess> for OnDiskCache<'sess> { interpret_alloc_index.reserve(new_n - n); for idx in n..new_n { let id = encoder.interpret_allocs[idx]; - let pos = encoder.position() as u32; + let pos: u32 = encoder.position().try_into().unwrap(); interpret_alloc_index.push(pos); interpret::specialized_encode_alloc_id(&mut encoder, tcx, id); } |
