Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
5a93b4f1
R
Rust
项目概览
int
/
Rust
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
5a93b4f1
编写于
5月 12, 2014
作者:
P
Patrick Walton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
libsemver: Remove all uses of `~str` from `libsemver`
上级
30dbcf5f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
21 deletion
+25
-21
src/libsemver/lib.rs
src/libsemver/lib.rs
+25
-21
未找到文件。
src/libsemver/lib.rs
浏览文件 @
5a93b4f1
...
...
@@ -50,7 +50,7 @@
#[allow(missing_doc)]
pub
enum
Identifier
{
Numeric
(
uint
),
AlphaNumeric
(
~
str
)
AlphaNumeric
(
StrBuf
)
}
impl
cmp
::
Ord
for
Identifier
{
...
...
@@ -158,7 +158,7 @@ fn lt(&self, other: &Version) -> bool {
}
fn
take_nonempty_prefix
<
T
:
Iterator
<
char
>>
(
rdr
:
&
mut
T
,
pred
:
|
char
|
->
bool
)
->
(
~
str
,
Option
<
char
>
)
{
->
(
StrBuf
,
Option
<
char
>
)
{
let
mut
buf
=
StrBuf
::
new
();
let
mut
ch
=
rdr
.next
();
loop
{
...
...
@@ -171,12 +171,12 @@ fn take_nonempty_prefix<T:Iterator<char>>(rdr: &mut T, pred: |char| -> bool)
}
}
}
(
buf
.into_owned
()
,
ch
)
(
buf
,
ch
)
}
fn
take_num
<
T
:
Iterator
<
char
>>
(
rdr
:
&
mut
T
)
->
Option
<
(
uint
,
Option
<
char
>
)
>
{
let
(
s
,
ch
)
=
take_nonempty_prefix
(
rdr
,
char
::
is_digit
);
match
from_str
::
<
uint
>
(
s
)
{
match
from_str
::
<
uint
>
(
s
.as_slice
()
)
{
None
=>
None
,
Some
(
i
)
=>
Some
((
i
,
ch
))
}
...
...
@@ -184,8 +184,8 @@ fn take_num<T: Iterator<char>>(rdr: &mut T) -> Option<(uint, Option<char>)> {
fn
take_ident
<
T
:
Iterator
<
char
>>
(
rdr
:
&
mut
T
)
->
Option
<
(
Identifier
,
Option
<
char
>
)
>
{
let
(
s
,
ch
)
=
take_nonempty_prefix
(
rdr
,
char
::
is_alphanumeric
);
if
s
.chars
()
.all
(
char
::
is_digit
)
{
match
from_str
::
<
uint
>
(
s
)
{
if
s
.
as_slice
()
.
chars
()
.all
(
char
::
is_digit
)
{
match
from_str
::
<
uint
>
(
s
.as_slice
()
)
{
None
=>
None
,
Some
(
i
)
=>
Some
((
Numeric
(
i
),
ch
))
}
...
...
@@ -308,14 +308,14 @@ fn test_parse() {
major
:
1u
,
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
owned
())),
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
strbuf
())),
build
:
vec!
(),
}));
assert
!
(
parse
(
" 1.2.3-alpha1 "
)
==
Some
(
Version
{
major
:
1u
,
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
owned
())),
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
strbuf
())),
build
:
vec!
()
}));
assert
!
(
parse
(
"1.2.3+build5"
)
==
Some
(
Version
{
...
...
@@ -323,37 +323,37 @@ fn test_parse() {
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
owned
()))
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
strbuf
()))
}));
assert
!
(
parse
(
" 1.2.3+build5 "
)
==
Some
(
Version
{
major
:
1u
,
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
owned
()))
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
strbuf
()))
}));
assert
!
(
parse
(
"1.2.3-alpha1+build5"
)
==
Some
(
Version
{
major
:
1u
,
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
owned
())),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
owned
()))
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
strbuf
())),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
strbuf
()))
}));
assert
!
(
parse
(
" 1.2.3-alpha1+build5 "
)
==
Some
(
Version
{
major
:
1u
,
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
owned
())),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
owned
()))
pre
:
vec!
(
AlphaNumeric
(
"alpha1"
.to_
strbuf
())),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
strbuf
()))
}));
assert
!
(
parse
(
"1.2.3-1.alpha1.9+build5.7.3aedf "
)
==
Some
(
Version
{
major
:
1u
,
minor
:
2u
,
patch
:
3u
,
pre
:
vec!
(
Numeric
(
1
),
AlphaNumeric
(
"alpha1"
.to_
owned
()),
Numeric
(
9
)),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
owned
()),
pre
:
vec!
(
Numeric
(
1
),
AlphaNumeric
(
"alpha1"
.to_
strbuf
()),
Numeric
(
9
)),
build
:
vec!
(
AlphaNumeric
(
"build5"
.to_
strbuf
()),
Numeric
(
7
),
AlphaNumeric
(
"3aedf"
.to_
owned
()))
AlphaNumeric
(
"3aedf"
.to_
strbuf
()))
}));
}
...
...
@@ -377,10 +377,14 @@ fn test_ne() {
#[test]
fn
test_show
()
{
assert_eq!
(
format!
(
"{}"
,
parse
(
"1.2.3"
)
.unwrap
()),
"1.2.3"
.to_owned
());
assert_eq!
(
format!
(
"{}"
,
parse
(
"1.2.3-alpha1"
)
.unwrap
()),
"1.2.3-alpha1"
.to_owned
());
assert_eq!
(
format!
(
"{}"
,
parse
(
"1.2.3+build.42"
)
.unwrap
()),
"1.2.3+build.42"
.to_owned
());
assert_eq!
(
format!
(
"{}"
,
parse
(
"1.2.3-alpha1+42"
)
.unwrap
()),
"1.2.3-alpha1+42"
.to_owned
());
assert_eq!
(
format_strbuf!
(
"{}"
,
parse
(
"1.2.3"
)
.unwrap
()),
"1.2.3"
.to_strbuf
());
assert_eq!
(
format_strbuf!
(
"{}"
,
parse
(
"1.2.3-alpha1"
)
.unwrap
()),
"1.2.3-alpha1"
.to_strbuf
());
assert_eq!
(
format_strbuf!
(
"{}"
,
parse
(
"1.2.3+build.42"
)
.unwrap
()),
"1.2.3+build.42"
.to_strbuf
());
assert_eq!
(
format_strbuf!
(
"{}"
,
parse
(
"1.2.3-alpha1+42"
)
.unwrap
()),
"1.2.3-alpha1+42"
.to_strbuf
());
}
#[test]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录