bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rename other occs of (Code/File)Map to Source(Map/File) #51574

Browse source
This commit is contained in:
David Lavati 2018-10-29 21:26:13 +01:00
parent d586d5d2f5
commit 6c9f6a1afd
13 changed files with 210 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libsyntax_pos/lib.rs
View file

@ -1266,9 +1266,9 @@ pub struct LocWithOpt {
// used to be structural records. Better names, anyone?
#[derive(Debug)]
pub struct SourceFileAndLine { pub fm: Lrc<SourceFile>, pub line: usize }
pub struct SourceFileAndLine { pub sf: Lrc<SourceFile>, pub line: usize }
#[derive(Debug)]
pub struct SourceFileAndBytePos { pub fm: Lrc<SourceFile>, pub pos: BytePos }
pub struct SourceFileAndBytePos { pub sf: Lrc<SourceFile>, pub pos: BytePos }
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
pub struct LineInfo {
@ -1303,7 +1303,7 @@ pub struct MacroBacktrace {
}
// _____________________________________________________________________________
// SpanLinesError, SpanSnippetError, DistinctSources, MalformedCodemapPositions
// SpanLinesError, SpanSnippetError, DistinctSources, MalformedSourceMapPositions
//
pub type FileLinesResult = Result<FileLines, SpanLinesError>;
@ -1318,7 +1318,7 @@ pub enum SpanLinesError {
pub enum SpanSnippetError {
IllFormedSpan(Span),
DistinctSources(DistinctSources),
MalformedForCodemap(MalformedCodemapPositions),
MalformedForSourcemap(MalformedSourceMapPositions),
SourceNotAvailable { filename: FileName }
}
@ -1329,7 +1329,7 @@ pub struct DistinctSources {
}
#[derive(Clone, PartialEq, Eq, Debug)]
pub struct MalformedCodemapPositions {
pub struct MalformedSourceMapPositions {
pub name: FileName,
pub source_len: usize,
pub begin_pos: BytePos,