Always cache const eval queries

oli-obk · oli-obk · commit 40629ef82722 · 2020-09-24T17:09:09.000+02:00
diff --git a/compiler/rustc_middle/src/query/mod.rs b/compiler/rustc_middle/src/query/mod.rs
@@ -716,10 +716,7 @@ rustc_queries! {
                 "const-evaluating + checking `{}`",
                 key.value.display(tcx)
             }
-            cache_on_disk_if(_, opt_result) {
-                // Only store results without errors
-                opt_result.map_or(true, |r| r.is_ok())
-            }
+            cache_on_disk_if { true }
         }
 
         /// Evaluates const items or anonymous constants
@@ -734,10 +731,7 @@ rustc_queries! {
                 "simplifying constant for the type system `{}`",
                 key.value.display(tcx)
             }
-            cache_on_disk_if(_, opt_result) {
-                // Only store results without errors
-                opt_result.map_or(true, |r| r.is_ok())
-            }
+            cache_on_disk_if { true }
         }
 
         /// Destructure a constant ADT or array into its variant index and its

Original file line number	Diff line number	Diff line change
`@@ -716,10 +716,7 @@ rustc_queries! {`
`716`	`716`	"const-evaluating + checking `{}`",
`717`	`717`	`key.value.display(tcx)`
`718`	`718`	`}`
`719`		`- cache_on_disk_if(_, opt_result) {`
`720`		`- // Only store results without errors`
`721`		`- opt_result.map_or(true, \|r\| r.is_ok())`
`722`		`- }`
	`719`	`+ cache_on_disk_if { true }`
`723`	`720`	`}`
`724`	`721`
`725`	`722`	`/// Evaluates const items or anonymous constants`
`@@ -734,10 +731,7 @@ rustc_queries! {`
`734`	`731`	"simplifying constant for the type system `{}`",
`735`	`732`	`key.value.display(tcx)`
`736`	`733`	`}`
`737`		`- cache_on_disk_if(_, opt_result) {`
`738`		`- // Only store results without errors`
`739`		`- opt_result.map_or(true, \|r\| r.is_ok())`
`740`		`- }`
	`734`	`+ cache_on_disk_if { true }`
`741`	`735`	`}`
`742`	`736`
`743`	`737`	`/// Destructure a constant ADT or array into its variant index and its`