Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
c915e3a1
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,发现更多精彩内容 >>
提交
c915e3a1
编写于
1月 26, 2018
作者:
A
Alex Crichton
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'mlsm' of
https://github.com/dotdash/rust
into rollup
上级
b741d7d7
aca88e18
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
78 addition
and
12 deletion
+78
-12
src/Cargo.lock
src/Cargo.lock
+9
-9
src/llvm
src/llvm
+1
-1
src/rustllvm/llvm-rebuild-trigger
src/rustllvm/llvm-rebuild-trigger
+1
-1
src/test/run-pass/issue-47364.rs
src/test/run-pass/issue-47364.rs
+66
-0
src/tools/rls
src/tools/rls
+1
-1
未找到文件。
src/Cargo.lock
浏览文件 @
c915e3a1
...
...
@@ -989,7 +989,7 @@ dependencies = [
[[package]]
name = "languageserver-types"
version = "0.
16
.0"
version = "0.
27
.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
...
...
@@ -1621,18 +1621,18 @@ name = "rls"
version = "0.124.0"
dependencies = [
"cargo 0.26.0",
"env_logger 0.
4
.3 (registry+https://github.com/rust-lang/crates.io-index)",
"env_logger 0.
5
.3 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"json 0.11.12 (registry+https://github.com/rust-lang/crates.io-index)",
"jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"languageserver-types 0.
16
.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static
0.2.11
(registry+https://github.com/rust-lang/crates.io-index)",
"log 0.
3.9
(registry+https://github.com/rust-lang/crates.io-index)",
"languageserver-types 0.
27
.0 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static
1.0.0
(registry+https://github.com/rust-lang/crates.io-index)",
"log 0.
4.1
(registry+https://github.com/rust-lang/crates.io-index)",
"racer 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-analysis 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-data 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-rustc 0.
1
.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-rustc 0.
2
.1 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
"rustfmt-nightly 0.3.6",
...
...
@@ -1668,7 +1668,7 @@ dependencies = [
[[package]]
name = "rls-rustc"
version = "0.
1
.1"
version = "0.
2
.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
...
...
@@ -2998,7 +2998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
"checksum kuchiki 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e03098e8e719c92b7794515dfd5c1724e2b12f5ce1788e61cfa4663f82eba8d8"
"checksum languageserver-types 0.
16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "773e175c945800aeea4c21c04090bcb9db987b1a566ad9c6f569972299950e3e
"
"checksum languageserver-types 0.
27.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a2036fc8576a22689b7e3171c07eb8e8f700678d7a8a53f6f65abbeb35261e1
"
"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
"checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
"checksum lazycell 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3b585b7a6811fb03aa10e74b278a0f00f8dd9b45dc681f148bb29fa5cb61859b"
...
...
@@ -3064,7 +3064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
"checksum rls-analysis 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "38841e3c5271715a574ac220d9b408b59ed9e2626909c3bc54b5853b4eaadb7b"
"checksum rls-data 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8024f1feaca72d0aa4ae1e2a8d454a31b9a33ed02f8d0e9c8559bf53c267ec3c"
"checksum rls-rustc 0.
1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b21ea952e9bf1569929abf1bb920262cde04b7b1b26d8e0260286302807299d
2"
"checksum rls-rustc 0.
2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "85cfb9dde19e313da3e47738008f8a472e470cc42d910b71595a9238494701f
2"
"checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a"
"checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff"
"checksum rustc-ap-rustc_cratesio_shim 12.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1a51c10af5abd5d698b7e3487e869e6d15f6feb04cbedb5c792e2824f9d845e"
...
...
llvm
@
bc344d5b
比较
27174447
...
bc344d5b
Subproject commit
2717444753318e461e0c3b30dacd03ffbac9690
3
Subproject commit
bc344d5bc23c61ff9baf82d268a0edf199933cc
3
src/rustllvm/llvm-rebuild-trigger
浏览文件 @
c915e3a1
# If this file is modified, then llvm will be (optionally) cleaned and then rebuilt.
# The actual contents of this file do not matter, but to trigger a change on the
# build bots then the contents should be changed so git updates the mtime.
201
7-11-08
201
8-01-25
src/test/run-pass/issue-47364.rs
0 → 100644
浏览文件 @
c915e3a1
// Copyright 2017 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.
// compile-flags: -C codegen-units=8 -O
fn
main
()
{
nom_sql
::
selection
(
b
"x "
);
}
pub
enum
Err
<
P
>
{
Position
(
P
),
NodePosition
(
u32
),
}
pub
enum
IResult
<
I
,
O
>
{
Done
(
I
,
O
),
Error
(
Err
<
I
>
),
Incomplete
(
u32
,
u64
)
}
pub
fn
multispace
<
T
:
Copy
>
(
input
:
T
)
->
::
IResult
<
i8
,
i8
>
{
::
IResult
::
Done
(
0
,
0
)
}
mod
nom_sql
{
fn
where_clause
(
i
:
&
[
u8
])
->
::
IResult
<&
[
u8
],
Option
<
String
>>
{
let
X
=
match
::
multispace
(
i
)
{
::
IResult
::
Done
(
..
)
=>
::
IResult
::
Done
(
i
,
None
::
<
String
>
),
_
=>
::
IResult
::
Error
(::
Err
::
NodePosition
(
0
)),
};
match
X
{
::
IResult
::
Done
(
_
,
_
)
=>
::
IResult
::
Done
(
i
,
None
),
_
=>
X
}
}
pub
fn
selection
(
i
:
&
[
u8
])
{
let
Y
=
match
{
match
{
where_clause
(
i
)
}
{
::
IResult
::
Done
(
_
,
o
)
=>
::
IResult
::
Done
(
i
,
Some
(
o
)),
::
IResult
::
Error
(
_
)
=>
::
IResult
::
Done
(
i
,
None
),
_
=>
::
IResult
::
Incomplete
(
0
,
0
),
}
}
{
::
IResult
::
Done
(
z
,
_
)
=>
::
IResult
::
Done
(
z
,
None
::
<
String
>
),
_
=>
return
()
};
match
Y
{
::
IResult
::
Done
(
x
,
_
)
=>
{
let
bytes
=
b
"; "
;
let
len
=
x
.len
();
bytes
[
len
];
}
_
=>
()
}
}
}
rls
@
511321ae
比较
299a6a91
...
511321ae
Subproject commit
299a6a91089af06b3b515450fece3c45a059dbbf
Subproject commit
511321ae1c2fa3f0e334885fecf406dd6c882836
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录