Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
01efe6d5
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,发现更多精彩内容 >>
未验证
提交
01efe6d5
编写于
2月 18, 2022
作者:
A
Aaron Hill
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Address review comments
上级
e686aee4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
24 deletion
+10
-24
compiler/rustc_macros/src/newtype.rs
compiler/rustc_macros/src/newtype.rs
+10
-24
未找到文件。
compiler/rustc_macros/src/newtype.rs
浏览文件 @
01efe6d5
...
@@ -37,7 +37,7 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
...
@@ -37,7 +37,7 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
braced!
(
body
in
input
);
braced!
(
body
in
input
);
// Any additional `#[derive]` macro paths to apply
// Any additional `#[derive]` macro paths to apply
let
mut
derive_paths
:
Option
<
Vec
<
Path
>>
=
None
;
let
mut
derive_paths
:
Vec
<
Path
>
=
Vec
::
new
()
;
let
mut
debug_format
:
Option
<
DebugFormat
>
=
None
;
let
mut
debug_format
:
Option
<
DebugFormat
>
=
None
;
let
mut
max
=
None
;
let
mut
max
=
None
;
let
mut
consts
=
Vec
::
new
();
let
mut
consts
=
Vec
::
new
();
...
@@ -62,28 +62,23 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
...
@@ -62,28 +62,23 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
let
derives
:
Punctuated
<
Path
,
Token!
[,]
>
=
let
derives
:
Punctuated
<
Path
,
Token!
[,]
>
=
derives
.parse_terminated
(
Path
::
parse
)
?
;
derives
.parse_terminated
(
Path
::
parse
)
?
;
try_comma
()
?
;
try_comma
()
?
;
if
let
Some
(
old
)
=
derive_paths
.replace
(
derives
.into_iter
()
.collect
())
{
derive_paths
.extend
(
derives
);
panic!
(
"Specified multiple derives: {:?}"
,
old
);
}
continue
;
continue
;
}
}
if
body
.lookahead1
()
.peek
(
kw
::
DEBUG_FORMAT
)
{
if
body
.lookahead1
()
.peek
(
kw
::
DEBUG_FORMAT
)
{
body
.parse
::
<
kw
::
DEBUG_FORMAT
>
()
?
;
body
.parse
::
<
kw
::
DEBUG_FORMAT
>
()
?
;
body
.parse
::
<
Token!
[
=
]
>
()
?
;
body
.parse
::
<
Token!
[
=
]
>
()
?
;
if
body
.lookahead1
()
.peek
(
kw
::
custom
)
{
let
new_debug_format
=
if
body
.lookahead1
()
.peek
(
kw
::
custom
)
{
body
.parse
::
<
kw
::
custom
>
()
?
;
body
.parse
::
<
kw
::
custom
>
()
?
;
if
let
Some
(
old
)
=
debug_format
.replace
(
DebugFormat
::
Custom
)
{
DebugFormat
::
Custom
panic!
(
"Specified multiple debug format options: {:?}"
,
old
);
}
}
else
{
}
else
{
let
format_str
:
LitStr
=
body
.parse
()
?
;
let
format_str
:
LitStr
=
body
.parse
()
?
;
if
let
Some
(
old
)
=
DebugFormat
::
Format
(
format_str
.value
())
debug_format
.replace
(
DebugFormat
::
Format
(
format_str
.value
()))
};
{
panic!
(
"Specified multiple debug format options: {:?}"
,
old
);
}
}
try_comma
()
?
;
try_comma
()
?
;
if
let
Some
(
old
)
=
debug_format
.replace
(
new_debug_format
)
{
panic!
(
"Specified multiple debug format options: {:?}"
,
old
);
}
continue
;
continue
;
}
}
if
body
.lookahead1
()
.peek
(
kw
::
MAX
)
{
if
body
.lookahead1
()
.peek
(
kw
::
MAX
)
{
...
@@ -121,7 +116,6 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
...
@@ -121,7 +116,6 @@ fn parse(input: ParseStream<'_>) -> Result<Self> {
}
}
}
}
let
derive_paths
=
derive_paths
.unwrap_or_else
(
Vec
::
new
);
let
debug_format
=
debug_format
.unwrap_or
(
DebugFormat
::
Format
(
"{}"
.to_string
()));
let
debug_format
=
debug_format
.unwrap_or
(
DebugFormat
::
Format
(
"{}"
.to_string
()));
// shave off 256 indices at the end to allow space for packing these indices into enums
// shave off 256 indices at the end to allow space for packing these indices into enums
let
max
=
max
.unwrap_or_else
(||
Lit
::
Int
(
LitInt
::
new
(
"0xFFFF_FF00"
,
Span
::
call_site
())));
let
max
=
max
.unwrap_or_else
(||
Lit
::
Int
(
LitInt
::
new
(
"0xFFFF_FF00"
,
Span
::
call_site
())));
...
@@ -158,7 +152,7 @@ fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
...
@@ -158,7 +152,7 @@ fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
Ok
(
Self
(
quote!
{
Ok
(
Self
(
quote!
{
#
(
#
attrs
)
*
#
(
#
attrs
)
*
#[derive(Copy,
PartialEq,
Eq,
Hash,
PartialOrd,
Ord,
#
(
#
derive_paths),
*
)]
#[derive(C
lone,
C
opy,
PartialEq,
Eq,
Hash,
PartialOrd,
Ord,
#
(
#
derive_paths),
*
)]
#[rustc_layout_scalar_valid_range_end(
#
max)]
#[rustc_layout_scalar_valid_range_end(
#
max)]
#
vis
struct
#
name
{
#
vis
struct
#
name
{
private
:
u32
,
private
:
u32
,
...
@@ -166,13 +160,6 @@ fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
...
@@ -166,13 +160,6 @@ fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
#
(
#
consts
)
*
#
(
#
consts
)
*
impl
Clone
for
#
name
{
#[inline]
fn
clone
(
&
self
)
->
Self
{
*
self
}
}
impl
#
name
{
impl
#
name
{
/// Maximum value the index can take, as a `u32`.
/// Maximum value the index can take, as a `u32`.
#
vis
const
MAX_AS_U32
:
u32
=
#
max
;
#
vis
const
MAX_AS_U32
:
u32
=
#
max
;
...
@@ -313,7 +300,6 @@ fn from(value: u32) -> Self {
...
@@ -313,7 +300,6 @@ fn from(value: u32) -> Self {
#
encodable_impls
#
encodable_impls
#
debug_impl
#
debug_impl
}))
}))
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录