rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use try_with for with implementation

Browse Source
This commit is contained in:
Lee Bousfield
2017-07-12 10:55:39 -06:00
parent 8b5549defb
commit a301f84b6a
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libstd/thread/local.rs
View File

@@ -284,15 +284,8 @@ impl<T: 'static> LocalKey<T> {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub fn with<F, R>(&'static self, f: F) -> R pub fn with<F, R>(&'static self, f: F) -> R
where F: FnOnce(&T) -> R { where F: FnOnce(&T) -> R {
unsafe { self.try_with(f).expect("cannot access a TLS value during or \
let slot = (self.inner)(); after it is destroyed")
let slot = slot.expect("cannot access a TLS value during or \
after it is destroyed");
f(match *slot.get() {
Some(ref inner) => inner,
None => self.init(slot),
})
}
} }
unsafe fn init(&self, slot: &UnsafeCell<Option<T>>) -> &T { unsafe fn init(&self, slot: &UnsafeCell<Option<T>>) -> &T {