Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
80e84e00
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,发现更多精彩内容 >>
提交
80e84e00
编写于
5月 30, 2014
作者:
J
Jakub Wieczorek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use RHS's struct def ID for error messages in pattern matching
Fixes #14541
上级
faa7ba75
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
6 deletion
+24
-6
src/librustc/middle/typeck/check/_match.rs
src/librustc/middle/typeck/check/_match.rs
+4
-6
src/test/compile-fail/issue-14541.rs
src/test/compile-fail/issue-14541.rs
+20
-0
未找到文件。
src/librustc/middle/typeck/check/_match.rs
浏览文件 @
80e84e00
...
...
@@ -298,9 +298,8 @@ pub fn check_pat_variant(pcx: &pat_ctxt, pat: &ast::Pat, path: &ast::Path,
/// `etc` is true if the pattern said '...' and false otherwise.
pub
fn
check_struct_pat_fields
(
pcx
:
&
pat_ctxt
,
span
:
Span
,
path
:
&
ast
::
Path
,
fields
:
&
[
ast
::
FieldPat
],
class_fields
:
Vec
<
ty
::
field_ty
>
,
class_fields
:
Vec
<
ty
::
field_ty
>
,
class_id
:
ast
::
DefId
,
substitutions
:
&
ty
::
substs
,
etc
:
bool
)
{
...
...
@@ -333,13 +332,12 @@ pub fn check_struct_pat_fields(pcx: &pat_ctxt,
found_fields
.insert
(
index
);
}
None
=>
{
let
name
=
pprust
::
path_to_str
(
path
);
// Check the pattern anyway, so that attempts to look
// up its type won't fail
check_pat
(
pcx
,
field
.pat
,
ty
::
mk_err
());
tcx
.sess
.span_err
(
span
,
format!
(
"struct `{}` does not have a field named `{}`"
,
name
,
ty
::
item_path_str
(
tcx
,
class_id
)
,
token
::
get_ident
(
field
.ident
))
.as_slice
());
}
}
...
...
@@ -390,7 +388,7 @@ pub fn check_struct_pat(pcx: &pat_ctxt, pat_id: ast::NodeId, span: Span,
}
}
check_struct_pat_fields
(
pcx
,
span
,
path
,
fields
,
class_fields
,
struct_id
,
check_struct_pat_fields
(
pcx
,
span
,
fields
,
class_fields
,
struct_id
,
substitutions
,
etc
);
}
...
...
@@ -413,7 +411,7 @@ pub fn check_struct_like_enum_variant_pat(pcx: &pat_ctxt,
// Get the struct fields from this struct-like enum variant.
let
class_fields
=
ty
::
lookup_struct_fields
(
tcx
,
variant_id
);
check_struct_pat_fields
(
pcx
,
span
,
path
,
fields
,
class_fields
,
check_struct_pat_fields
(
pcx
,
span
,
fields
,
class_fields
,
variant_id
,
substitutions
,
etc
);
}
Some
(
&
ast
::
DefStruct
(
..
))
|
Some
(
&
ast
::
DefVariant
(
..
))
=>
{
...
...
src/test/compile-fail/issue-14541.rs
0 → 100644
浏览文件 @
80e84e00
// 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.
struct
vec2
{
y
:
f32
}
struct
vec3
{
y
:
f32
,
z
:
f32
}
fn
make
(
v
:
vec2
)
{
let
vec3
{
y
:
_
,
z
:
_
}
=
v
;
//~^ ERROR mismatched types: expected `vec2` but found `vec3`
//~^^ ERROR struct `vec2` does not have a field named `z`
}
fn
main
()
{
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录