about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-09-05 03:04:20 +0000
committerbors <bors@rust-lang.org>2018-09-05 03:04:20 +0000
commit0be2c303692cab31390e52701007cfa87867bf74 (patch)
treea7a48f343f3573463febf77234d4d674f524d522 /src/libsyntax
parentf68b7cc59896427d378c9e3bae6f5fd7a1f1fad9 (diff)
parent9ec5ef541ad17986bfe6ae067a84ea8f7b7ae133 (diff)
downloadrust-0be2c303692cab31390e52701007cfa87867bf74.tar.gz
rust-0be2c303692cab31390e52701007cfa87867bf74.zip
Auto merge of #53075 - Mark-Simulacrum:update-cargolock, r=alexcrichton
Update Cargo.lock

This also includes major version bumps for the rand crate used by core, std, and alloc tests, among other crates (regex, etc.) used elsewhere. Since these are all internal there should be no user-visible changes.

r? @alexcrichton
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/source_map.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/source_map.rs b/src/libsyntax/source_map.rs
index 8f91db8efa7..95839f94b9e 100644
--- a/src/libsyntax/source_map.rs
+++ b/src/libsyntax/source_map.rs
@@ -24,7 +24,7 @@ pub use self::ExpnFormat::*;
 
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::stable_hasher::StableHasher;
-use rustc_data_structures::sync::{Lrc, Lock, LockGuard};
+use rustc_data_structures::sync::{Lrc, Lock, LockGuard, MappedLockGuard};
 use std::cmp;
 use std::hash::Hash;
 use std::path::{Path, PathBuf};
@@ -194,7 +194,7 @@ impl SourceMap {
         Ok(self.new_source_file(filename, src))
     }
 
-    pub fn files(&self) -> LockGuard<Vec<Lrc<SourceFile>>> {
+    pub fn files(&self) -> MappedLockGuard<Vec<Lrc<SourceFile>>> {
         LockGuard::map(self.files.borrow(), |files| &mut files.file_maps)
     }