Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
0a10b9dc
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
0a10b9dc
编写于
9月 24, 2014
作者:
P
Piotr Czarnecki
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix free lifetime vars in HashMap's iterators
上级
b8599ecd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
52 addition
and
5 deletion
+52
-5
src/libstd/collections/hashmap/table.rs
src/libstd/collections/hashmap/table.rs
+15
-5
src/test/compile-fail/hashmap-iter-value-lifetime.rs
src/test/compile-fail/hashmap-iter-value-lifetime.rs
+20
-0
src/test/compile-fail/hashmap-lifetimes.rs
src/test/compile-fail/hashmap-lifetimes.rs
+17
-0
未找到文件。
src/libstd/collections/hashmap/table.rs
浏览文件 @
0a10b9dc
...
...
@@ -663,7 +663,8 @@ fn raw_buckets(&self) -> RawBuckets<K, V> {
raw
:
self
.first_bucket_raw
(),
hashes_end
:
unsafe
{
self
.hashes
.offset
(
self
.capacity
as
int
)
}
},
marker
:
marker
::
ContravariantLifetime
,
}
}
...
...
@@ -682,8 +683,14 @@ pub fn iter_mut(&mut self) -> MutEntries<K, V> {
}
pub
fn
into_iter
(
self
)
->
MoveEntries
<
K
,
V
>
{
let
RawBuckets
{
raw
,
hashes_end
,
..
}
=
self
.raw_buckets
();
// Replace the marker regardless of lifetime bounds on parameters.
MoveEntries
{
iter
:
self
.raw_buckets
(),
iter
:
RawBuckets
{
raw
:
raw
,
hashes_end
:
hashes_end
,
marker
:
marker
::
ContravariantLifetime
,
},
table
:
self
,
}
}
...
...
@@ -695,7 +702,8 @@ unsafe fn rev_move_buckets(&mut self) -> RevMoveBuckets<K, V> {
RevMoveBuckets
{
raw
:
raw_bucket
.offset
(
self
.capacity
as
int
),
hashes_end
:
raw_bucket
.hash
,
elems_left
:
self
.size
elems_left
:
self
.size
,
marker
:
marker
::
ContravariantLifetime
,
}
}
}
...
...
@@ -704,7 +712,8 @@ unsafe fn rev_move_buckets(&mut self) -> RevMoveBuckets<K, V> {
/// this interface is safe, it's not used outside this module.
struct
RawBuckets
<
'a
,
K
,
V
>
{
raw
:
RawBucket
<
K
,
V
>
,
hashes_end
:
*
mut
u64
hashes_end
:
*
mut
u64
,
marker
:
marker
::
ContravariantLifetime
<
'a
>
,
}
impl
<
'a
,
K
,
V
>
Iterator
<
RawBucket
<
K
,
V
>>
for
RawBuckets
<
'a
,
K
,
V
>
{
...
...
@@ -730,7 +739,8 @@ fn next(&mut self) -> Option<RawBucket<K, V>> {
struct
RevMoveBuckets
<
'a
,
K
,
V
>
{
raw
:
RawBucket
<
K
,
V
>
,
hashes_end
:
*
mut
u64
,
elems_left
:
uint
elems_left
:
uint
,
marker
:
marker
::
ContravariantLifetime
<
'a
>
,
}
impl
<
'a
,
K
,
V
>
Iterator
<
(
K
,
V
)
>
for
RevMoveBuckets
<
'a
,
K
,
V
>
{
...
...
src/test/compile-fail/hashmap-iter-value-lifetime.rs
0 → 100644
浏览文件 @
0a10b9dc
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn
main
()
{
let
mut
my_stuff
=
std
::
collections
::
HashMap
::
new
();
my_stuff
.insert
(
0
i
,
42
i
);
let
(
_
,
thing
)
=
my_stuff
.iter
()
.next
()
.unwrap
();
my_stuff
.clear
();
//~ ERROR cannot borrow
println!
(
"{}"
,
*
thing
);
}
src/test/compile-fail/hashmap-lifetimes.rs
0 → 100644
浏览文件 @
0a10b9dc
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
fn
main
()
{
let
mut
my_stuff
=
std
::
collections
::
HashMap
::
new
();
my_stuff
.insert
(
0
i
,
42
i
);
let
mut
it
=
my_stuff
.iter
();
my_stuff
.swap
(
1
,
43
);
//~ ERROR cannot borrow
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录