Skip to content

Commit e6dd869

Browse files
committed
Divide up metadata into separate DepNodes
1 parent c98ca95 commit e6dd869

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

src/librustc/dep_graph/dep_node.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ macro_rules! define_dep_nodes {
8080
($(
8181
$variant:ident $(( $($tuple_arg:tt),* ))*
8282
$({ $($struct_arg_name:ident : $struct_arg_ty:ty),* })*
83-
),*
83+
,)*
8484
) => (
8585
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash,
8686
RustcEncodable, RustcDecodable)]
@@ -421,7 +421,11 @@ define_dep_nodes!(
421421
IsExportedSymbol(DefId),
422422
IsMirAvailable(DefId),
423423
ItemAttrs(DefId),
424-
FnArgNames(DefId)
424+
FnArgNames(DefId),
425+
DylibDepFormats(DefId),
426+
IsAllocator(DefId),
427+
IsPanicRuntime(DefId),
428+
ExternCrate(DefId),
425429
);
426430

427431
trait DepNodeParams<'a, 'gcx: 'tcx + 'a, 'tcx: 'a> {

src/librustc/ty/maps.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -964,13 +964,13 @@ define_maps! { <'tcx>
964964
[] layout_raw: layout_dep_node(ty::ParamEnvAnd<'tcx, Ty<'tcx>>)
965965
-> Result<&'tcx Layout, LayoutError<'tcx>>,
966966

967-
[] dylib_dependency_formats: MetaData(DefId)
967+
[] dylib_dependency_formats: DylibDepFormats(DefId)
968968
-> Rc<Vec<(CrateNum, LinkagePreference)>>,
969969

970-
[] is_allocator: MetaData(DefId) -> bool,
971-
[] is_panic_runtime: MetaData(DefId) -> bool,
970+
[] is_allocator: IsAllocator(DefId) -> bool,
971+
[] is_panic_runtime: IsPanicRuntime(DefId) -> bool,
972972

973-
[] extern_crate: MetaData(DefId) -> Rc<Option<ExternCrate>>,
973+
[] extern_crate: ExternCrate(DefId) -> Rc<Option<ExternCrate>>,
974974
}
975975

976976
fn type_param_predicates((item_id, param_id): (DefId, DefId)) -> DepConstructor {

0 commit comments

Comments
 (0)