Fix nightly build

Rust-for-Linux · Sep 19, 2023 · 0854be3 · 0854be3
1 parent 9ad23c1
commit 0854be3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/ctxt.rs b/src/ctxt.rs
@@ -255,10 +255,9 @@ impl<'tcx> AnalysisCtxt<'tcx> {
     }
 
     pub fn new(tcx: TyCtxt<'tcx>) -> Self {
-        let crate_name = tcx.crate_name(LOCAL_CRATE);
         let output_filenames = tcx.output_filenames(());
         let rmeta_path =
-            rustc_session::output::filename_for_metadata(tcx.sess, crate_name, output_filenames);
+            rustc_session::output::filename_for_metadata(tcx.sess, output_filenames);
         let rmeta_path = rmeta_path.as_path();
 
         // Double check that the rmeta file is .rlib or .rmeta

diff --git a/src/monomorphize_collector.rs b/src/monomorphize_collector.rs
@@ -587,8 +587,8 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirUsedCollector<'a, 'tcx> {
         let param_env = ty::ParamEnv::reveal_all();
         let val = match literal.eval(self.tcx, param_env, None) {
             Ok(v) => v,
-            Err(ErrorHandled::Reported(_)) => return,
-            Err(ErrorHandled::TooGeneric) => span_bug!(
+            Err(ErrorHandled::Reported(..)) => return,
+            Err(ErrorHandled::TooGeneric(..)) => span_bug!(
                 self.body.source_info(location).span,
                 "collection encountered polymorphic constant: {:?}",
                 literal

diff --git a/src/preempt_count/check.rs b/src/preempt_count/check.rs
@@ -359,8 +359,8 @@ impl<'mir, 'tcx, 'cx> MirVisitor<'tcx> for MirNeighborVisitor<'mir, 'tcx, 'cx> {
         let param_env = ty::ParamEnv::reveal_all();
         let val = match literal.eval(self.cx.tcx, param_env, None) {
             Ok(v) => v,
-            Err(ErrorHandled::Reported(_)) => return,
-            Err(ErrorHandled::TooGeneric) => {
+            Err(ErrorHandled::Reported(..)) => return,
+            Err(ErrorHandled::TooGeneric(..)) => {
                 self.result = Err(Error::TooGeneric);
                 return;
             }