diff options
| author | bors <bors@rust-lang.org> | 2019-08-08 23:39:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-08 23:39:01 +0000 |
| commit | 5aa3d9a7b5d3a46a7f158e8881146331a6bc9243 (patch) | |
| tree | 0235c6e12166debd6990519714e3c3291041570c /src/libsyntax | |
| parent | 2d1a551e144335e0d60a637d12f410cf65849876 (diff) | |
| parent | 87fb0ad4850ad710bb53440a12186006b498e785 (diff) | |
Auto merge of #63395 - Centril:rollup-kt805cj, r=Centril
Rollup of 6 pull requests
Successful merges:
- #63162 (Miri tests: use xargo to build separate libstd)
- #63289 (Don't recommend `extern crate` syntax)
- #63373 (gitignore: add comment explaining policy)
- #63374 (move of packed fields might or might not occur when they actually are sufficiently aligned)
- #63381 (reduce visibility)
- #63387 (Test interaction between `async { ... }` and `?`, `return`, and `break`)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/source_map.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs index f83c1dbf7ee..4e29c77c89e 100644 --- a/src/libsyntax/source_map.rs +++ b/src/libsyntax/source_map.rs @@ -125,12 +125,12 @@ impl StableSourceFileId { #[derive(Default)] pub(super) struct SourceMapFiles { - pub(super) source_files: Vec<Lrc<SourceFile>>, + source_files: Vec<Lrc<SourceFile>>, stable_id_to_source_file: FxHashMap<StableSourceFileId, Lrc<SourceFile>> } pub struct SourceMap { - pub(super) files: Lock<SourceMapFiles>, + files: Lock<SourceMapFiles>, file_loader: Box<dyn FileLoader + Sync + Send>, // This is used to apply the file path remapping as specified via // --remap-path-prefix to all SourceFiles allocated within this SourceMap. |