diff options
| author | bors <bors@rust-lang.org> | 2022-06-17 05:13:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-17 05:13:07 +0000 |
| commit | 0423e06ca96067ea6f166921a7905ecb339eb155 (patch) | |
| tree | c540d89c9cd0ba658f8b53640fe08ac1b7e7f445 /compiler/rustc_codegen_ssa/src | |
| parent | 3cf1275ecced3ef088e030a697ff442a7740ae54 (diff) | |
| parent | bb02cc47c49ee3cc1e913c243d69ee7cb23df598 (diff) | |
| download | rust-0423e06ca96067ea6f166921a7905ecb339eb155.tar.gz rust-0423e06ca96067ea6f166921a7905ecb339eb155.zip | |
Auto merge of #98160 - nnethercote:mv-finish-out-of-Encoder, r=bjorn3
Move `finish` out of the `Encoder` trait. This simplifies things, but requires making `CacheEncoder` non-generic. (This was previously merged as commit 4 in #94732 and then was reverted in #97905 because it caused a perf regression.) r? `@ghost`
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs index 750432b0b26..6c30923bc3d 100644 --- a/compiler/rustc_codegen_ssa/src/lib.rs +++ b/compiler/rustc_codegen_ssa/src/lib.rs @@ -211,7 +211,7 @@ impl CodegenResults { encoder.emit_raw_bytes(&RLINK_VERSION.to_be_bytes()); encoder.emit_str(RUSTC_VERSION.unwrap()); Encodable::encode(codegen_results, &mut encoder); - encoder.finish().unwrap() + encoder.finish() } pub fn deserialize_rlink(data: Vec<u8>) -> Result<Self, String> { |