Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
6fcba882
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,发现更多精彩内容 >>
提交
6fcba882
编写于
10月 30, 2014
作者:
A
Alex Crichton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Test fixes and rebase conflicts
上级
c10c1633
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
17 addition
and
16 deletion
+17
-16
src/libcore/panicking.rs
src/libcore/panicking.rs
+3
-3
src/libnative/io/timer_windows.rs
src/libnative/io/timer_windows.rs
+1
-1
src/librustc/lint/context.rs
src/librustc/lint/context.rs
+1
-1
src/libstd/dynamic_lib.rs
src/libstd/dynamic_lib.rs
+1
-0
src/libstd/os.rs
src/libstd/os.rs
+1
-1
src/libsyntax/ext/quote.rs
src/libsyntax/ext/quote.rs
+1
-1
src/libsyntax/parse/token.rs
src/libsyntax/parse/token.rs
+7
-7
src/test/compile-fail/coerce-bare-fn-to-closure-and-proc.rs
src/test/compile-fail/coerce-bare-fn-to-closure-and-proc.rs
+2
-2
未找到文件。
src/libcore/panicking.rs
浏览文件 @
6fcba882
...
...
@@ -28,7 +28,7 @@
//! one function. Currently, the actual symbol is declared in the standard
//! library, but the location of this may change over time.
#![allow(dead_code,
missing_doc)]
#![allow(dead_code,
missing_doc
s
)]
use
fmt
;
use
intrinsics
;
...
...
@@ -63,7 +63,7 @@ fn panic_bounds_check(file_line: &(&'static str, uint),
#[cfg(stage0)]
#[cold]
#[inline(never)]
pub
fn
panic_fmt
(
fmt
:
&
fmt
::
Arguments
,
file_line
:
&
(
&
'static
str
,
uint
))
->
!
{
#[allow(ctypes)]
#[allow(
improper_
ctypes)]
extern
{
#[lang
=
"fail_fmt"
]
fn
panic_impl
(
fmt
:
&
fmt
::
Arguments
,
file
:
&
'static
str
,
...
...
@@ -104,7 +104,7 @@ fn panic_bounds_check(file_line: &(&'static str, uint),
#[cfg(not(stage0))]
#[cold]
#[inline(never)]
pub
fn
panic_fmt
(
fmt
:
&
fmt
::
Arguments
,
file_line
:
&
(
&
'static
str
,
uint
))
->
!
{
#[allow(ctypes)]
#[allow(
improper_
ctypes)]
extern
{
#[lang
=
"panic_fmt"
]
fn
panic_impl
(
fmt
:
&
fmt
::
Arguments
,
file
:
&
'static
str
,
...
...
src/libnative/io/timer_windows.rs
浏览文件 @
6fcba882
...
...
@@ -79,7 +79,7 @@ fn helper(input: libc::HANDLE, messages: Receiver<Req>, _: ()) {
}
}
else
{
let
remove
=
{
match
chans
.get_mut
(
idx
as
uint
-
1
)
{
match
&
mut
chans
[
idx
as
uint
-
1
]
{
&
(
ref
mut
c
,
oneshot
)
=>
{
c
.call
();
oneshot
}
}
};
...
...
src/librustc/lint/context.rs
浏览文件 @
6fcba882
...
...
@@ -254,7 +254,7 @@ pub fn register_builtin(&mut self, sess: Option<&Session>) {
}
#[allow(unused_variable)]
#[allow(unused_variable
s
)]
fn
find_lint
(
&
self
,
lint_name
:
&
str
,
sess
:
&
Session
,
span
:
Option
<
Span
>
)
->
Option
<
LintId
>
{
...
...
src/libstd/dynamic_lib.rs
浏览文件 @
6fcba882
...
...
@@ -286,6 +286,7 @@ pub mod dl {
use
os
;
use
ptr
;
use
result
::{
Ok
,
Err
,
Result
};
use
slice
::
ImmutableSlice
;
use
str
::
StrSlice
;
use
str
;
use
string
::
String
;
...
...
src/libstd/os.rs
浏览文件 @
6fcba882
...
...
@@ -144,7 +144,7 @@ pub mod windows {
use
option
::{
None
,
Option
};
use
option
;
use
os
::
TMPBUF_SZ
;
use
slice
::
MutableSlice
;
use
slice
::
{
MutableSlice
,
ImmutableSlice
}
;
use
string
::
String
;
use
str
::
StrSlice
;
use
vec
::
Vec
;
...
...
src/libsyntax/ext/quote.rs
浏览文件 @
6fcba882
...
...
@@ -540,7 +540,7 @@ fn mk_delim(cx: &ExtCtxt, sp: Span, delim: token::DelimToken) -> P<ast::Expr> {
mk_token_path
(
cx
,
sp
,
name
)
}
#[allow(non_upper
case_statics)]
// NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper
_case_globals)]
fn
mk_token
(
cx
:
&
ExtCtxt
,
sp
:
Span
,
tok
:
&
token
::
Token
)
->
P
<
ast
::
Expr
>
{
match
*
tok
{
token
::
BinOp
(
binop
)
=>
{
...
...
src/libsyntax/parse/token.rs
浏览文件 @
6fcba882
...
...
@@ -110,10 +110,10 @@ pub enum DelimToken {
}
#[cfg(stage0)]
#[allow(non_upper
case_static
s)]
#[allow(non_upper
_case_global
s)]
pub
const
ModName
:
bool
=
true
;
#[cfg(stage0)]
#[allow(non_upper
case_static
s)]
#[allow(non_upper
_case_global
s)]
pub
const
Plain
:
bool
=
false
;
#[deriving(Clone,
Encodable,
Decodable,
PartialEq,
Eq,
Hash,
Show)]
...
...
@@ -263,7 +263,7 @@ pub fn is_path(&self) -> bool {
/// Returns `true` if the token is a path that is not followed by a `::`
/// token.
#[allow(non_upper
case_statics)]
// NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper
_case_globals)]
pub
fn
is_plain_ident
(
&
self
)
->
bool
{
match
*
self
{
Ident
(
_
,
Plain
)
=>
true
,
...
...
@@ -311,7 +311,7 @@ pub fn to_binop(&self) -> Option<ast::BinOp> {
}
/// Returns `true` if the token is a given keyword, `kw`.
#[allow(non_upper
case_statics)]
// NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper
_case_globals)]
pub
fn
is_keyword
(
&
self
,
kw
:
keywords
::
Keyword
)
->
bool
{
match
*
self
{
Ident
(
sid
,
Plain
)
=>
kw
.to_name
()
==
sid
.name
,
...
...
@@ -321,7 +321,7 @@ pub fn is_keyword(&self, kw: keywords::Keyword) -> bool {
/// Returns `true` if the token is either a special identifier, or a strict
/// or reserved keyword.
#[allow(non_upper
case_statics)]
// NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper
_case_globals)]
pub
fn
is_any_keyword
(
&
self
)
->
bool
{
match
*
self
{
Ident
(
sid
,
Plain
)
=>
{
...
...
@@ -338,7 +338,7 @@ pub fn is_any_keyword(&self) -> bool {
}
/// Returns `true` if the token may not appear as an identifier.
#[allow(non_upper
case_statics)]
// NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper
_case_globals)]
pub
fn
is_strict_keyword
(
&
self
)
->
bool
{
match
*
self
{
Ident
(
sid
,
Plain
)
=>
{
...
...
@@ -364,7 +364,7 @@ pub fn is_strict_keyword(&self) -> bool {
/// Returns `true` if the token is a keyword that has been reserved for
/// possible future use.
#[allow(non_upper
case_statics)]
// NOTE(stage0): remove this attribute after the next snapshot
#[allow(non_upper
_case_globals)]
pub
fn
is_reserved_keyword
(
&
self
)
->
bool
{
match
*
self
{
Ident
(
sid
,
Plain
)
=>
{
...
...
src/test/compile-fail/coerce-bare-fn-to-closure-and-proc.rs
浏览文件 @
6fcba882
...
...
@@ -14,8 +14,8 @@ fn main() {
let
f
=
foo
;
let
f_closure
:
||
=
f
;
//~^ ERROR: cannot coerce non-statically resolved bare fn to closure
//~^ HELP: consider embedding the function in a closure
//~^
^
HELP: consider embedding the function in a closure
let
f_proc
:
proc
()
=
f
;
//~^ ERROR: cannot coerce non-statically resolved bare fn to closure
//~^ HELP: consider embedding the function in a closure
//~^
^
HELP: consider embedding the function in a closure
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录