Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8396efe

Browse files
committedOct 26, 2023
Auto merge of rust-lang#117228 - matthiaskrgr:rollup-23zzepv, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#116905 (refactor(compiler/resolve): simplify some code) - rust-lang#117095 (Add way to differentiate argument locals from other locals in Stable MIR) - rust-lang#117143 (Avoid unbounded O(n^2) when parsing nested type args) - rust-lang#117194 (Minor improvements to `rustc_incremental`) - rust-lang#117202 (Revert "Remove TaKO8Ki from reviewers") - rust-lang#117207 (The value of `-Cinstrument-coverage=` doesn't need to be `Option`) - rust-lang#117214 (Quietly fail if an error has already occurred) - rust-lang#117221 (Rename type flag `HAS_TY_GENERATOR` to `HAS_TY_COROUTINE`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 698db85 + a461de7 commit 8396efe

File tree

104 files changed

+278
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+278
-82
lines changed
 

‎compiler/rustc_borrowck/src/type_check/free_region_relations.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use rustc_infer::infer::InferCtxt;
88
use rustc_middle::mir::ConstraintCategory;
99
use rustc_middle::traits::query::OutlivesBound;
1010
use rustc_middle::ty::{self, RegionVid, Ty};
11-
use rustc_span::{Span, DUMMY_SP};
11+
use rustc_span::{ErrorGuaranteed, Span, DUMMY_SP};
1212
use rustc_trait_selection::traits::query::type_op::{self, TypeOp};
1313
use std::rc::Rc;
1414
use type_op::TypeOpOutput;
@@ -318,7 +318,8 @@ impl<'tcx> UniversalRegionRelationsBuilder<'_, 'tcx> {
318318
.param_env
319319
.and(type_op::implied_outlives_bounds::ImpliedOutlivesBounds { ty })
320320
.fully_perform(self.infcx, DUMMY_SP)
321-
.unwrap_or_else(|_| bug!("failed to compute implied bounds {:?}", ty));
321+
.map_err(|_: ErrorGuaranteed| debug!("failed to compute implied bounds {:?}", ty))
322+
.ok()?;
322323
debug!(?bounds, ?constraints);
323324
self.add_outlives_bounds(bounds);
324325
constraints

‎compiler/rustc_incremental/src/lib.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![cfg_attr(not(bootstrap), doc(rust_logo))]
66
#![cfg_attr(not(bootstrap), feature(rustdoc_internals))]
77
#![cfg_attr(not(bootstrap), allow(internal_features))]
8-
#![feature(never_type)]
98
#![recursion_limit = "256"]
109
#![deny(rustc::untranslatable_diagnostic)]
1110
#![deny(rustc::diagnostic_outside_of_impl)]
@@ -19,15 +18,11 @@ mod assert_dep_graph;
1918
mod errors;
2019
mod persist;
2120

22-
use assert_dep_graph::assert_dep_graph;
2321
pub use persist::copy_cgu_workproduct_to_incr_comp_cache_dir;
24-
pub use persist::delete_workproduct_files;
2522
pub use persist::finalize_session_directory;
26-
pub use persist::garbage_collect_session_directories;
2723
pub use persist::in_incr_comp_dir;
2824
pub use persist::in_incr_comp_dir_sess;
2925
pub use persist::load_query_result_cache;
30-
pub use persist::prepare_session_directory;
3126
pub use persist::save_dep_graph;
3227
pub use persist::save_work_product_index;
3328
pub use persist::setup_dep_graph;

0 commit comments

Comments
 (0)