Skip to content

Commit dac47e8

Browse files
committed
---
yaml --- r: 62555 b: refs/heads/snap-stage3 c: 43c6f32 h: refs/heads/master i: 62553: a507362 62551: 4b8113f v: v3
1 parent af9c175 commit dac47e8

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: b0722c55f8205a43a0b8124ca179dada766c23ed
4+
refs/heads/snap-stage3: 43c6f32ece85a7df86ee041771a54c097dae6a13
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
pub trait Local {
12+
fn put_local(value: ~Self);
13+
fn take_local() -> ~Self;
14+
fn exists() -> bool;
15+
fn borrow(f: &fn(&mut Self));
16+
fn unsafe_borrow() -> *mut Self;
17+
}

branches/snap-stage3/src/libcore/rt/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ mod rtio;
8181
#[path = "uv/mod.rs"]
8282
pub mod uv;
8383

84+
/// The Local trait for types that are accessible via thread-local
85+
/// or task-local storage.
86+
pub mod local;
87+
8488
// FIXME #5248: The import in `sched` doesn't resolve unless this is pub!
8589
/// Bindings to pthread/windows thread-local storage.
8690
pub mod thread_local_storage;

0 commit comments

Comments
 (0)