bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Wrap some long comment lines.

Browse source
This commit is contained in:
Nicholas Nethercote 2022-09-20 14:29:14 +10:00
parent 432abd86f2
commit b7dc9341b5
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_metadata/src/rmeta/encoder.rs
View file

@ -261,10 +261,10 @@ impl<'a, 'tcx> Encodable<EncodeContext<'a, 'tcx>> for Span {
// This allows us to avoid loading the dependencies of proc-macro crates: all of // This allows us to avoid loading the dependencies of proc-macro crates: all of
// the information we need to decode `Span`s is stored in the proc-macro crate. // the information we need to decode `Span`s is stored in the proc-macro crate.
let (tag, metadata_index) = if source_file.is_imported() && !s.is_proc_macro { let (tag, metadata_index) = if source_file.is_imported() && !s.is_proc_macro {
// To simplify deserialization, we 'rebase' this span onto the crate it originally came from // To simplify deserialization, we 'rebase' this span onto the crate it originally came
// (the crate that 'owns' the file it references. These rebased 'lo' and 'hi' values // from (the crate that 'owns' the file it references. These rebased 'lo' and 'hi'
// are relative to the source map information for the 'foreign' crate whose CrateNum // values are relative to the source map information for the 'foreign' crate whose
// we write into the metadata. This allows `imported_source_files` to binary // CrateNum we write into the metadata. This allows `imported_source_files` to binary
// search through the 'foreign' crate's source map information, using the // search through the 'foreign' crate's source map information, using the
// deserialized 'lo' and 'hi' values directly. // deserialized 'lo' and 'hi' values directly.
// //
@ -672,12 +672,11 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
let exported_symbols_bytes = self.position() - i; let exported_symbols_bytes = self.position() - i;
// Encode the hygiene data, // Encode the hygiene data,
// IMPORTANT: this *must* be the last thing that we encode (other than `SourceMap`). The process // IMPORTANT: this *must* be the last thing that we encode (other than `SourceMap`). The
// of encoding other items (e.g. `optimized_mir`) may cause us to load // process of encoding other items (e.g. `optimized_mir`) may cause us to load data from
// data from the incremental cache. If this causes us to deserialize a `Span`, // the incremental cache. If this causes us to deserialize a `Span`, then we may load
// then we may load additional `SyntaxContext`s into the global `HygieneData`. // additional `SyntaxContext`s into the global `HygieneData`. Therefore, we need to encode
// Therefore, we need to encode the hygiene data last to ensure that we encode // the hygiene data last to ensure that we encode any `SyntaxContext`s that might be used.
// any `SyntaxContext`s that might be used.
i = self.position(); i = self.position();
let (syntax_contexts, expn_data, expn_hashes) = self.encode_hygiene(); let (syntax_contexts, expn_data, expn_hashes) = self.encode_hygiene();
let hygiene_bytes = self.position() - i; let hygiene_bytes = self.position() - i;