Skip to content

Commit 09a6388

Browse files
cjgillotcjgillot
committed
Move raw bytes handling to Encoder/Decoder.
1 parent e5d09fb commit 09a6388

File tree

9 files changed

+84
-49
lines changed

9 files changed

+84
-49
lines changed

‎compiler/rustc_data_structures/src/fingerprint.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::stable_hasher;
22
use rustc_serialize::{
33
opaque::{self, EncodeResult, FileEncodeResult},
4-
Decodable, Encodable,
4+
Decodable, Decoder, Encodable, Encoder,
55
};
66
use std::hash::{Hash, Hasher};
77
use std::mem::{self, MaybeUninit};
@@ -158,7 +158,7 @@ impl<E: rustc_serialize::Encoder> FingerprintEncoder for E {
158158
impl FingerprintEncoder for opaque::Encoder {
159159
fn encode_fingerprint(&mut self, f: &Fingerprint) -> EncodeResult {
160160
let bytes: [u8; 16] = unsafe { mem::transmute([f.0.to_le(), f.1.to_le()]) };
161-
self.emit_raw_bytes(&bytes);
161+
self.emit_raw_bytes(&bytes)?;
162162
Ok(())
163163
}
164164
}

‎compiler/rustc_incremental/src/persist/file_format.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use std::io::{self, Read};
1515
use std::path::Path;
1616

1717
use rustc_serialize::opaque::{FileEncodeResult, FileEncoder};
18+
use rustc_serialize::Encoder;
1819

1920
/// The first few bytes of files generated by incremental compilation.
2021
const FILE_MAGIC: &[u8] = b"RSIC";

‎compiler/rustc_metadata/src/rmeta/encoder.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ impl<'a, 'tcx> Encoder for EncodeContext<'a, 'tcx> {
116116
emit_f32(f32);
117117
emit_char(char);
118118
emit_str(&str);
119+
emit_raw_bytes(&[u8]);
119120
}
120121
}
121122

@@ -2070,10 +2071,10 @@ pub(super) fn encode_metadata(tcx: TyCtxt<'_>) -> EncodedMetadata {
20702071

20712072
fn encode_metadata_impl(tcx: TyCtxt<'_>) -> EncodedMetadata {
20722073
let mut encoder = opaque::Encoder::new(vec![]);
2073-
encoder.emit_raw_bytes(METADATA_HEADER);
2074+
encoder.emit_raw_bytes(METADATA_HEADER).unwrap();
20742075

20752076
// Will be filled with the root position after encoding everything.
2076-
encoder.emit_raw_bytes(&[0, 0, 0, 0]);
2077+
encoder.emit_raw_bytes(&[0, 0, 0, 0]).unwrap();
20772078

20782079
let source_map_files = tcx.sess.source_map().files();
20792080
let source_file_cache = (source_map_files[0].clone(), 0);

‎compiler/rustc_metadata/src/rmeta/table.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use crate::rmeta::*;
22

33
use rustc_index::vec::Idx;
44
use rustc_serialize::opaque::Encoder;
5+
use rustc_serialize::Encoder as _;
56
use std::convert::TryInto;
67
use std::marker::PhantomData;
78
use std::num::NonZeroUsize;
@@ -172,7 +173,7 @@ where
172173

173174
pub(crate) fn encode(&self, buf: &mut Encoder) -> Lazy<Table<I, T>> {
174175
let pos = buf.position();
175-
buf.emit_raw_bytes(&self.bytes);
176+
buf.emit_raw_bytes(&self.bytes).unwrap();
176177
Lazy::from_position_and_meta(NonZeroUsize::new(pos as usize).unwrap(), self.bytes.len())
177178
}
178179
}

‎compiler/rustc_middle/src/ty/codec.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,11 @@ macro_rules! implement_ty_decoder {
472472
read_str -> Cow<'_, str>;
473473
}
474474

475+
#[inline]
476+
fn read_raw_bytes(&mut self, bytes: &mut [std::mem::MaybeUninit<u8>]) -> Result<(), Self::Error> {
477+
self.opaque.read_raw_bytes(bytes)
478+
}
479+
475480
fn error(&mut self, err: &str) -> Self::Error {
476481
self.opaque.error(err)
477482
}

‎compiler/rustc_middle/src/ty/query/on_disk_cache.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,6 +1167,7 @@ where
11671167
emit_f32(f32);
11681168
emit_char(char);
11691169
emit_str(&str);
1170+
emit_raw_bytes(&[u8]);
11701171
}
11711172
}
11721173

‎compiler/rustc_serialize/src/json.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ use std::collections::{BTreeMap, HashMap};
188188
use std::io;
189189
use std::io::prelude::*;
190190
use std::mem::swap;
191+
use std::mem::MaybeUninit;
191192
use std::num::FpCategory as Fp;
192193
use std::ops::Index;
193194
use std::str::FromStr;
@@ -553,6 +554,12 @@ impl<'a> crate::Encoder for Encoder<'a> {
553554
fn emit_str(&mut self, v: &str) -> EncodeResult {
554555
escape_str(self.writer, v)
555556
}
557+
fn emit_raw_bytes(&mut self, s: &[u8]) -> Result<(), Self::Error> {
558+
for &c in s.iter() {
559+
self.emit_u8(c)?;
560+
}
561+
Ok(())
562+
}
556563

557564
fn emit_enum<F>(&mut self, _name: &str, f: F) -> EncodeResult
558565
where
@@ -879,6 +886,12 @@ impl<'a> crate::Encoder for PrettyEncoder<'a> {
879886
fn emit_str(&mut self, v: &str) -> EncodeResult {
880887
escape_str(self.writer, v)
881888
}
889+
fn emit_raw_bytes(&mut self, s: &[u8]) -> Result<(), Self::Error> {
890+
for &c in s.iter() {
891+
self.emit_u8(c)?;
892+
}
893+
Ok(())
894+
}
882895

883896
fn emit_enum<F>(&mut self, _name: &str, f: F) -> EncodeResult
884897
where
@@ -2354,6 +2367,14 @@ impl crate::Decoder for Decoder {
23542367
expect!(self.pop(), String).map(Cow::Owned)
23552368
}
23562369

2370+
fn read_raw_bytes(&mut self, s: &mut [MaybeUninit<u8>]) -> Result<(), Self::Error> {
2371+
for c in s.iter_mut() {
2372+
let h = self.read_u8()?;
2373+
unsafe { *c.as_mut_ptr() = h };
2374+
}
2375+
Ok(())
2376+
}
2377+
23572378
fn read_enum<T, F>(&mut self, _name: &str, f: F) -> DecodeResult<T>
23582379
where
23592380
F: FnOnce(&mut Decoder) -> DecodeResult<T>,

‎compiler/rustc_serialize/src/opaque.rs

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::leb128::{self, max_leb128_len};
2-
use crate::serialize;
2+
use crate::serialize::{self, Decoder as _, Encoder as _};
33
use std::borrow::Cow;
44
use std::fs::File;
55
use std::io::{self, Write};
@@ -30,11 +30,6 @@ impl Encoder {
3030
pub fn position(&self) -> usize {
3131
self.data.len()
3232
}
33-
34-
#[inline]
35-
pub fn emit_raw_bytes(&mut self, s: &[u8]) {
36-
self.data.extend_from_slice(s);
37-
}
3833
}
3934

4035
macro_rules! write_leb128 {
@@ -154,7 +149,12 @@ impl serialize::Encoder for Encoder {
154149
#[inline]
155150
fn emit_str(&mut self, v: &str) -> EncodeResult {
156151
self.emit_usize(v.len())?;
157-
self.emit_raw_bytes(v.as_bytes());
152+
self.emit_raw_bytes(v.as_bytes())
153+
}
154+
155+
#[inline]
156+
fn emit_raw_bytes(&mut self, s: &[u8]) -> EncodeResult {
157+
self.data.extend_from_slice(s);
158158
Ok(())
159159
}
160160
}
@@ -208,11 +208,6 @@ impl FileEncoder {
208208
self.flushed + self.buffered
209209
}
210210

211-
#[inline]
212-
pub fn emit_raw_bytes(&mut self, s: &[u8]) -> FileEncodeResult {
213-
self.write_all(s)
214-
}
215-
216211
pub fn flush(&mut self) -> FileEncodeResult {
217212
// This is basically a copy of `BufWriter::flush`. If `BufWriter` ever
218213
// offers a raw buffer access API, we can use it, and remove this.
@@ -508,6 +503,11 @@ impl serialize::Encoder for FileEncoder {
508503
self.emit_usize(v.len())?;
509504
self.emit_raw_bytes(v.as_bytes())
510505
}
506+
507+
#[inline]
508+
fn emit_raw_bytes(&mut self, s: &[u8]) -> FileEncodeResult {
509+
self.write_all(s)
510+
}
511511
}
512512

513513
// -----------------------------------------------------------------------------
@@ -539,26 +539,6 @@ impl<'a> Decoder<'a> {
539539
pub fn advance(&mut self, bytes: usize) {
540540
self.position += bytes;
541541
}
542-
543-
#[inline]
544-
pub fn read_raw_bytes(&mut self, s: &mut [MaybeUninit<u8>]) -> Result<(), String> {
545-
let start = self.position;
546-
let end = start + s.len();
547-
assert!(end <= self.data.len());
548-
549-
// SAFETY: Both `src` and `dst` point to at least `s.len()` elements:
550-
// `src` points to at least `s.len()` elements by above assert, and
551-
// `dst` points to `s.len()` elements by derivation from `s`.
552-
unsafe {
553-
let src = self.data.as_ptr().add(start);
554-
let dst = s.as_mut_ptr() as *mut u8;
555-
ptr::copy_nonoverlapping(src, dst, s.len());
556-
}
557-
558-
self.position = end;
559-
560-
Ok(())
561-
}
562542
}
563543

564544
macro_rules! read_leb128 {
@@ -677,6 +657,26 @@ impl<'a> serialize::Decoder for Decoder<'a> {
677657
fn error(&mut self, err: &str) -> Self::Error {
678658
err.to_string()
679659
}
660+
661+
#[inline]
662+
fn read_raw_bytes(&mut self, s: &mut [MaybeUninit<u8>]) -> Result<(), String> {
663+
let start = self.position;
664+
let end = start + s.len();
665+
assert!(end <= self.data.len());
666+
667+
// SAFETY: Both `src` and `dst` point to at least `s.len()` elements:
668+
// `src` points to at least `s.len()` elements by above assert, and
669+
// `dst` points to `s.len()` elements by derivation from `s`.
670+
unsafe {
671+
let src = self.data.as_ptr().add(start);
672+
let dst = s.as_mut_ptr() as *mut u8;
673+
ptr::copy_nonoverlapping(src, dst, s.len());
674+
}
675+
676+
self.position = end;
677+
678+
Ok(())
679+
}
680680
}
681681

682682
// Specializations for contiguous byte sequences follow. The default implementations for slices
@@ -689,8 +689,7 @@ impl<'a> serialize::Decoder for Decoder<'a> {
689689
impl serialize::Encodable<Encoder> for [u8] {
690690
fn encode(&self, e: &mut Encoder) -> EncodeResult {
691691
serialize::Encoder::emit_usize(e, self.len())?;
692-
e.emit_raw_bytes(self);
693-
Ok(())
692+
e.emit_raw_bytes(self)
694693
}
695694
}
696695

@@ -727,32 +726,35 @@ impl IntEncodedWithFixedSize {
727726
}
728727

729728
impl serialize::Encodable<Encoder> for IntEncodedWithFixedSize {
729+
#[inline]
730730
fn encode(&self, e: &mut Encoder) -> EncodeResult {
731-
let start_pos = e.position();
732-
e.emit_raw_bytes(&self.0.to_le_bytes());
733-
let end_pos = e.position();
734-
assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
731+
let _start_pos = e.position();
732+
e.emit_raw_bytes(&self.0.to_le_bytes())?;
733+
let _end_pos = e.position();
734+
debug_assert_eq!((_end_pos - _start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
735735
Ok(())
736736
}
737737
}
738738

739739
impl serialize::Encodable<FileEncoder> for IntEncodedWithFixedSize {
740+
#[inline]
740741
fn encode(&self, e: &mut FileEncoder) -> FileEncodeResult {
741-
let start_pos = e.position();
742+
let _start_pos = e.position();
742743
e.emit_raw_bytes(&self.0.to_le_bytes())?;
743-
let end_pos = e.position();
744-
assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
744+
let _end_pos = e.position();
745+
debug_assert_eq!((_end_pos - _start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
745746
Ok(())
746747
}
747748
}
748749

749750
impl<'a> serialize::Decodable<Decoder<'a>> for IntEncodedWithFixedSize {
751+
#[inline]
750752
fn decode(decoder: &mut Decoder<'a>) -> Result<IntEncodedWithFixedSize, String> {
751753
let mut bytes = MaybeUninit::uninit_array();
752-
let start_pos = decoder.position();
754+
let _start_pos = decoder.position();
753755
decoder.read_raw_bytes(&mut bytes)?;
754-
let end_pos = decoder.position();
755-
assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
756+
let _end_pos = decoder.position();
757+
debug_assert_eq!((_end_pos - _start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
756758

757759
let value = u64::from_le_bytes(unsafe { MaybeUninit::array_assume_init(bytes) });
758760
Ok(IntEncodedWithFixedSize(value))

‎compiler/rustc_serialize/src/serialize.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Core encoding and decoding interfaces.
77
use std::borrow::Cow;
88
use std::cell::{Cell, RefCell};
99
use std::marker::PhantomData;
10+
use std::mem::MaybeUninit;
1011
use std::path;
1112
use std::rc::Rc;
1213
use std::sync::Arc;
@@ -33,6 +34,7 @@ pub trait Encoder {
3334
fn emit_f32(&mut self, v: f32) -> Result<(), Self::Error>;
3435
fn emit_char(&mut self, v: char) -> Result<(), Self::Error>;
3536
fn emit_str(&mut self, v: &str) -> Result<(), Self::Error>;
37+
fn emit_raw_bytes(&mut self, s: &[u8]) -> Result<(), Self::Error>;
3638

3739
// Compound types:
3840
#[inline]
@@ -224,6 +226,7 @@ pub trait Decoder {
224226
fn read_f32(&mut self) -> Result<f32, Self::Error>;
225227
fn read_char(&mut self) -> Result<char, Self::Error>;
226228
fn read_str(&mut self) -> Result<Cow<'_, str>, Self::Error>;
229+
fn read_raw_bytes(&mut self, s: &mut [MaybeUninit<u8>]) -> Result<(), Self::Error>;
227230

228231
// Compound types:
229232
#[inline]

0 commit comments

Comments
 (0)