Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
0390736d
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,发现更多精彩内容 >>
提交
0390736d
编写于
9月 17, 2018
作者:
D
Donato Sciarra
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve ux when calling associated functions with dot notation
Issue: 22692
上级
eb50e757
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
69 addition
and
14 deletion
+69
-14
src/librustc_resolve/lib.rs
src/librustc_resolve/lib.rs
+45
-14
src/test/ui/resolve/issue-22692.rs
src/test/ui/resolve/issue-22692.rs
+13
-0
src/test/ui/resolve/issue-22692.stderr
src/test/ui/resolve/issue-22692.stderr
+11
-0
未找到文件。
src/librustc_resolve/lib.rs
浏览文件 @
0390736d
...
...
@@ -3160,11 +3160,11 @@ fn smart_resolve_path_fragment(&mut self,
// parser issue where a struct literal is being used on an expression
// where a brace being opened means a block is being started. Look
// ahead for the next text to see if `span` is followed by a `{`.
let
c
m
=
this
.session
.source_map
();
let
s
m
=
this
.session
.source_map
();
let
mut
sp
=
span
;
loop
{
sp
=
c
m
.next_point
(
sp
);
match
c
m
.span_to_snippet
(
sp
)
{
sp
=
s
m
.next_point
(
sp
);
match
s
m
.span_to_snippet
(
sp
)
{
Ok
(
ref
snippet
)
=>
{
if
snippet
.chars
()
.any
(|
c
|
{
!
c
.is_whitespace
()
})
{
break
;
...
...
@@ -3173,20 +3173,51 @@ fn smart_resolve_path_fragment(&mut self,
_
=>
break
,
}
}
let
followed_by_brace
=
match
c
m
.span_to_snippet
(
sp
)
{
let
followed_by_brace
=
match
s
m
.span_to_snippet
(
sp
)
{
Ok
(
ref
snippet
)
if
snippet
==
"{"
=>
true
,
_
=>
false
,
};
if
let
(
PathSource
::
Expr
(
None
),
true
)
=
(
source
,
followed_by_brace
)
{
err
.span_label
(
span
,
format!
(
"did you mean `({} {{ /* fields */ }})`?"
,
path_str
),
);
}
else
{
err
.span_label
(
span
,
format!
(
"did you mean `{} {{ /* fields */ }}`?"
,
path_str
),
);
match
source
{
PathSource
::
Expr
(
Some
(
parent
))
=>
{
match
parent
.node
{
ExprKind
::
MethodCall
(
ref
path_assignment
,
_
)
=>
{
err
.span_suggestion_with_applicability
(
sm
.start_point
(
parent
.span
)
.to
(
path_assignment
.ident.span
),
"use `::` to access an associated function"
,
format!
(
"{}::{}"
,
path_str
,
path_assignment
.ident
),
Applicability
::
MaybeIncorrect
);
return
(
err
,
candidates
);
},
_
=>
{
err
.span_label
(
span
,
format!
(
"did you mean `{} {{ /* fields */ }}`?"
,
path_str
),
);
return
(
err
,
candidates
);
},
}
},
PathSource
::
Expr
(
None
)
if
followed_by_brace
==
true
=>
{
err
.span_label
(
span
,
format!
(
"did you mean `({} {{ /* fields */ }})`?"
,
path_str
),
);
return
(
err
,
candidates
);
},
_
=>
{
err
.span_label
(
span
,
format!
(
"did you mean `{} {{ /* fields */ }}`?"
,
path_str
),
);
return
(
err
,
candidates
);
},
}
}
return
(
err
,
candidates
);
...
...
src/test/ui/resolve/issue-22692.rs
0 → 100644
浏览文件 @
0390736d
// Copyright 2018 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
_
=
String
.new
();
}
src/test/ui/resolve/issue-22692.stderr
0 → 100644
浏览文件 @
0390736d
error[E0423]: expected value, found struct `String`
--> $DIR/issue-22692.rs:12:13
|
LL | let _ = String.new();
| ^^^^^^----
| |
| help: use `::` to access an associated function: `String::new`
error: aborting due to previous error
For more information about this error, try `rustc --explain E0423`.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录