Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
cb56b2d1
R
Rust
项目概览
int
/
Rust
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cb56b2d1
编写于
3月 01, 2018
作者:
S
Stjepan Glavina
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix a bug introduced in previous commit
上级
082dd6d7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
8 deletion
+5
-8
src/libstd/io/stdio.rs
src/libstd/io/stdio.rs
+2
-2
src/libstd/thread/local.rs
src/libstd/thread/local.rs
+3
-6
未找到文件。
src/libstd/io/stdio.rs
浏览文件 @
cb56b2d1
...
...
@@ -663,8 +663,8 @@ pub fn set_print(sink: Option<Box<Write + Send>>) -> Option<Box<Write + Send>> {
///
/// This function is used to print error messages, so it takes extra
/// care to avoid causing a panic when `local_stream` is unusable.
/// For instance, if the TLS key for the local stream is
uninitialized
///
or
already destroyed, or if the local stream is locked by another
/// For instance, if the TLS key for the local stream is
/// already destroyed, or if the local stream is locked by another
/// thread, it will just fall back to the global stream.
///
/// However, if the actual I/O causes an error, this function does panic.
...
...
src/libstd/thread/local.rs
浏览文件 @
cb56b2d1
...
...
@@ -272,7 +272,7 @@ unsafe fn init(&self, slot: &UnsafeCell<Option<T>>) -> &T {
///
/// This will lazily initialize the value if this thread has not referenced
/// this key yet. If the key has been destroyed (which may happen if this is called
/// in a destructor), this function will return a
ThreadLocalError
.
/// in a destructor), this function will return a
`ThreadLocalError`
.
///
/// # Panics
///
...
...
@@ -484,11 +484,7 @@ fn drop(&mut self) {
assert
!
(
FOO
.try_with
(|
_
|
())
.is_err
());
}
}
fn
foo
()
->
Foo
{
assert
!
(
FOO
.try_with
(|
_
|
())
.is_err
());
Foo
}
thread_local!
(
static
FOO
:
Foo
=
foo
());
thread_local!
(
static
FOO
:
Foo
=
Foo
);
thread
::
spawn
(||
{
assert
!
(
FOO
.try_with
(|
_
|
())
.is_ok
());
...
...
@@ -520,6 +516,7 @@ fn circular() {
impl
Drop
for
S1
{
fn
drop
(
&
mut
self
)
{
unsafe
{
HITS
+=
1
;
if
K2
.try_with
(|
_
|
())
.is_err
()
{
assert_eq!
(
HITS
,
3
);
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录