Remove krate!.

nnethercote · nnethercote · commit 8f707c3a9836 · 2019-10-07T09:35:47.000+11:00
diff --git a/src/librustc/ty/query/plumbing.rs b/src/librustc/ty/query/plumbing.rs
@@ -1202,10 +1202,6 @@ pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
         }
     };
 
-    macro_rules! krate {
-        () => { (def_id!()).krate }
-    };
-
     macro_rules! force_ex {
         ($tcx:expr, $query:ident, $key:expr) => {
             {
@@ -1236,7 +1232,7 @@ pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {
             bug!("force_from_dep_node: encountered {:?}", dep_node)
         }
 
-        DepKind::Analysis => { force_ex!(tcx, analysis, krate!()); }
+        DepKind::Analysis => { force_ex!(tcx, analysis, def_id!().krate); }
     );
 
     true

Original file line number	Diff line number	Diff line change
`@@ -1202,10 +1202,6 @@ pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {`
`1202`	`1202`	`}`
`1203`	`1203`	`};`
`1204`	`1204`
`1205`		`- macro_rules! krate {`
`1206`		`- () => { (def_id!()).krate }`
`1207`		`- };`
`1208`		`-`
`1209`	`1205`	`macro_rules! force_ex {`
`1210`	`1206`	`($tcx:expr, $query:ident, $key:expr) => {`
`1211`	`1207`	`{`
`@@ -1236,7 +1232,7 @@ pub fn force_from_dep_node(tcx: TyCtxt<'_>, dep_node: &DepNode) -> bool {`
`1236`	`1232`	`bug!("force_from_dep_node: encountered {:?}", dep_node)`
`1237`	`1233`	`}`
`1238`	`1234`
`1239`		`- DepKind::Analysis => { force_ex!(tcx, analysis, krate!()); }`
	`1235`	`+ DepKind::Analysis => { force_ex!(tcx, analysis, def_id!().krate); }`
`1240`	`1236`	`);`
`1241`	`1237`
`1242`	`1238`	`true`