Skip to content

Commit b248767

Browse files
committed
Remove support for dep node structs
1 parent a852225 commit b248767

File tree

1 file changed

+0
-41
lines changed

1 file changed

+0
-41
lines changed

src/librustc/dep_graph/dep_node.rs

-41
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ macro_rules! define_dep_nodes {
111111
$(
112112
[$($attrs:tt)*]
113113
$variant:ident $(( $tuple_arg_ty:ty $(,)? ))*
114-
$({ $($struct_arg_name:ident : $struct_arg_ty:ty),* })*
115114
,)*
116115
) => (
117116
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
@@ -136,13 +135,6 @@ macro_rules! define_dep_nodes {
136135
::CAN_RECONSTRUCT_QUERY_KEY;
137136
})*
138137

139-
// struct args
140-
$({
141-
142-
return <( $($struct_arg_ty,)* ) as DepNodeParams>
143-
::CAN_RECONSTRUCT_QUERY_KEY;
144-
})*
145-
146138
true
147139
}
148140
)*
@@ -176,12 +168,6 @@ macro_rules! define_dep_nodes {
176168
return true;
177169
})*
178170

179-
// struct args
180-
$({
181-
$(erase!($struct_arg_name);)*
182-
return true;
183-
})*
184-
185171
false
186172
}
187173
)*
@@ -192,7 +178,6 @@ macro_rules! define_dep_nodes {
192178
pub enum DepConstructor<$tcx> {
193179
$(
194180
$variant $(( $tuple_arg_ty ))*
195-
$({ $($struct_arg_name : $struct_arg_ty),* })*
196181
),*
197182
}
198183

@@ -212,7 +197,6 @@ macro_rules! define_dep_nodes {
212197
match dep {
213198
$(
214199
DepConstructor :: $variant $(( replace!(($tuple_arg_ty) with arg) ))*
215-
$({ $($struct_arg_name),* })*
216200
=>
217201
{
218202
// tuple args
@@ -239,31 +223,6 @@ macro_rules! define_dep_nodes {
239223
return dep_node;
240224
})*
241225

242-
// struct args
243-
$({
244-
let tupled_args = ( $($struct_arg_name,)* );
245-
let hash = DepNodeParams::to_fingerprint(&tupled_args,
246-
tcx);
247-
let dep_node = DepNode {
248-
kind: DepKind::$variant,
249-
hash
250-
};
251-
252-
#[cfg(debug_assertions)]
253-
{
254-
if !dep_node.kind.can_reconstruct_query_key() &&
255-
(tcx.sess.opts.debugging_opts.incremental_info ||
256-
tcx.sess.opts.debugging_opts.query_dep_graph)
257-
{
258-
tcx.dep_graph.register_dep_node_debug_str(dep_node, || {
259-
tupled_args.to_debug_str(tcx)
260-
});
261-
}
262-
}
263-
264-
return dep_node;
265-
})*
266-
267226
DepNode {
268227
kind: DepKind::$variant,
269228
hash: Fingerprint::ZERO,

0 commit comments

Comments
 (0)