Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
67394f20
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,发现更多精彩内容 >>
提交
67394f20
编写于
9月 27, 2013
作者:
B
bors
浏览文件
操作
浏览文件
下载
差异文件
auto merge of #9552 : brson/rust/0.9-pre, r=alexcrichton
上级
e699d914
99c1fb8c
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
15 addition
and
15 deletion
+15
-15
Makefile.in
Makefile.in
+2
-2
src/etc/kate/rust.xml
src/etc/kate/rust.xml
+1
-1
src/libextra/extra.rs
src/libextra/extra.rs
+1
-1
src/librust/rust.rs
src/librust/rust.rs
+1
-1
src/librustc/front/std_inject.rs
src/librustc/front/std_inject.rs
+1
-1
src/librustc/front/test.rs
src/librustc/front/test.rs
+1
-1
src/librustc/rustc.rs
src/librustc/rustc.rs
+1
-1
src/librustdoc/rustdoc.rs
src/librustdoc/rustdoc.rs
+1
-1
src/librusti/rusti.rs
src/librusti/rusti.rs
+1
-1
src/librustpkg/rustpkg.rs
src/librustpkg/rustpkg.rs
+1
-1
src/libstd/std.rs
src/libstd/std.rs
+2
-2
src/libsyntax/syntax.rs
src/libsyntax/syntax.rs
+1
-1
src/test/run-pass/use.rs
src/test/run-pass/use.rs
+1
-1
未找到文件。
Makefile.in
浏览文件 @
67394f20
...
...
@@ -141,11 +141,11 @@ endif
# version-string calculation
CFG_GIT_DIR
:=
$(CFG_SRC_DIR)
.git
CFG_RELEASE
=
0.
8
CFG_RELEASE
=
0.
9-pre
CFG_VERSION
=
$(CFG_RELEASE)
# windows exe's need numeric versions - don't use anything but
# numbers and dots here
CFG_VERSION_WIN
=
0.
8
CFG_VERSION_WIN
=
0.
9
ifneq
($(wildcard $(CFG_GIT)),)
ifneq
($(wildcard $(CFG_GIT_DIR)),)
...
...
src/etc/kate/rust.xml
浏览文件 @
67394f20
...
...
@@ -7,7 +7,7 @@
<!ENTITY rustIdent "[a-zA-Z_][a-zA-Z_0-9]*">
<!ENTITY rustIntSuf "([iu](8|16|32|64)?)?">
]>
<language
name=
"Rust"
version=
"0.
8
"
kateversion=
"2.4"
section=
"Sources"
extensions=
"*.rs;*.rc"
mimetype=
"text/x-rust"
priority=
"15"
>
<language
name=
"Rust"
version=
"0.
9-pre
"
kateversion=
"2.4"
section=
"Sources"
extensions=
"*.rs;*.rc"
mimetype=
"text/x-rust"
priority=
"15"
>
<highlighting>
<list
name=
"fn"
>
<item>
fn
</item>
...
...
src/libextra/extra.rs
浏览文件 @
67394f20
...
...
@@ -21,7 +21,7 @@
*/
#[link(name
=
"extra"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"122bed0b-c19b-4b82-b0b7-7ae8aead7297"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/libextra"
)]
;
...
...
src/librust/rust.rs
浏览文件 @
67394f20
...
...
@@ -13,7 +13,7 @@
// FIXME #2238 Make run only accept source that emits an executable
#[link(name
=
"rust"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"4a24da33-5cc8-4037-9352-2cbe9bd9d27c"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/rust"
)]
;
...
...
src/librustc/front/std_inject.rs
浏览文件 @
67394f20
...
...
@@ -20,7 +20,7 @@
use
syntax
::
fold
;
use
syntax
::
opt_vec
;
static
STD_VERSION
:
&
'static
str
=
"0.
8
"
;
static
STD_VERSION
:
&
'static
str
=
"0.
9-pre
"
;
pub
fn
maybe_inject_libstd_ref
(
sess
:
Session
,
crate
:
@
ast
::
Crate
)
->
@
ast
::
Crate
{
...
...
src/librustc/front/test.rs
浏览文件 @
67394f20
...
...
@@ -279,7 +279,7 @@ fn mk_std(cx: &TestCtxt) -> ast::view_item {
path_node
(
~
[
id_extra
]),
ast
::
DUMMY_NODE_ID
))])
}
else
{
let
mi
=
attr
::
mk_name_value_item_str
(
@
"vers"
,
@
"0.
8
"
);
let
mi
=
attr
::
mk_name_value_item_str
(
@
"vers"
,
@
"0.
9-pre
"
);
ast
::
view_item_extern_mod
(
id_extra
,
None
,
~
[
mi
],
ast
::
DUMMY_NODE_ID
)
};
ast
::
view_item
{
...
...
src/librustc/rustc.rs
浏览文件 @
67394f20
...
...
@@ -9,7 +9,7 @@
// except according to those terms.
#[link(name
=
"rustc"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"0ce89b41-2f92-459e-bbc1-8f5fe32f16cf"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/rustc"
)]
;
...
...
src/librustdoc/rustdoc.rs
浏览文件 @
67394f20
...
...
@@ -9,7 +9,7 @@
// except according to those terms.
#[link(name
=
"rustdoc"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"8c6e4598-1596-4aa5-a24c-b811914bbbc6"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/librustdoc"
)]
;
...
...
src/librusti/rusti.rs
浏览文件 @
67394f20
...
...
@@ -59,7 +59,7 @@
*/
#[link(name
=
"rusti"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"7fb5bf52-7d45-4fee-8325-5ad3311149fc"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/rusti"
)]
;
...
...
src/librustpkg/rustpkg.rs
浏览文件 @
67394f20
...
...
@@ -11,7 +11,7 @@
// rustpkg - a package manager and build system for Rust
#[link(name
=
"rustpkg"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"25de5e6e-279e-4a20-845c-4cabae92daaf"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/librustpkg"
)]
;
...
...
src/libstd/std.rs
浏览文件 @
67394f20
...
...
@@ -49,7 +49,7 @@
#[link(name
=
"std"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"c70c24a7-5551-4f73-8e37-380b11d80be8"
,
url
=
"https://github.com/mozilla/rust/tree/master/src/libstd"
)]
;
...
...
@@ -67,7 +67,7 @@
#[deny(missing_doc)]
;
// Make extra accessible for benchmarking
#[cfg(test)]
extern
mod
extra
(
vers
=
"0.
8
"
);
#[cfg(test)]
extern
mod
extra
(
vers
=
"0.
9-pre
"
);
// Make std testable by not duplicating lang items. See #2912
#[cfg(test)]
extern
mod
realstd
(
name
=
"std"
);
...
...
src/libsyntax/syntax.rs
浏览文件 @
67394f20
...
...
@@ -14,7 +14,7 @@
*/
#[link(name
=
"syntax"
,
vers
=
"0.
8
"
,
vers
=
"0.
9-pre
"
,
uuid
=
"9311401b-d6ea-4cd9-a1d9-61f89499c645"
)]
;
#[license
=
"MIT/ASL2"
]
;
...
...
src/test/run-pass/use.rs
浏览文件 @
67394f20
...
...
@@ -15,7 +15,7 @@
#[no_std]
;
extern
mod
std
;
extern
mod
zed
(
name
=
"std"
);
extern
mod
bar
(
name
=
"std"
,
vers
=
"0.
8
"
);
extern
mod
bar
(
name
=
"std"
,
vers
=
"0.
9-pre
"
);
use
std
::
str
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录