Skip to content

Commit 44cfafe

Browse files
committed
Auto merge of #108707 - matthiaskrgr:rollup-9a2l6pc, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #107981 (new solver: implement canonicalization and region constraints) - #108553 (Deny capturing late-bound non-lifetime param in anon const) - #108599 (Remove legacy PM leftovers) - #108667 (Fix another ICE in `point_at_expr_source_of_inferred_type`) - #108674 (Clippy Fix array-size-threshold config deserialization error) - #108685 (Match unmatched backticks in compiler/) - #108694 (Match unmatched backticks in compiler/ comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7a809ce + 01fc5a7 commit 44cfafe

File tree

88 files changed

+1086
-222
lines changed

Some content is hidden

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

88 files changed

+1086
-222
lines changed

compiler/rustc_ast/src/util/parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl AssocOp {
225225
AssignOp(_) | // `{ 42 } +=`
226226
As | // `{ 42 } as usize`
227227
// Equal | // `{ 42 } == { 42 }` Accepting these here would regress incorrect
228-
// NotEqual | // `{ 42 } != { 42 } struct literals parser recovery.
228+
// NotEqual | // `{ 42 } != { 42 }` struct literals parser recovery.
229229
Colon, // `{ 42 }: usize`
230230
)
231231
}

compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
16071607
hir::OwnerNode::Item(self.arena.alloc(opaque_ty_item))
16081608
}
16091609

1610-
/// Given a `parent_def_id`, a list of `lifetimes_in_bounds and a `remapping` hash to be
1610+
/// Given a `parent_def_id`, a list of `lifetimes_in_bounds` and a `remapping` hash to be
16111611
/// filled, this function creates new definitions for `Param` and `Fresh` lifetimes, inserts the
16121612
/// new definition, adds it to the remapping with the definition of the given lifetime and
16131613
/// returns a list of lifetimes to be lowered afterwards.

compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl<'a> AstValidator<'a> {
192192
// We allow these:
193193
// - `Option<impl Trait>`
194194
// - `option::Option<impl Trait>`
195-
// - `option::Option<T>::Foo<impl Trait>
195+
// - `option::Option<T>::Foo<impl Trait>`
196196
//
197197
// But not these:
198198
// - `<impl Trait>::Foo`

compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
415415
/// fn foo<'a, 'b>(x: &'a u32) -> &'b u32 { x }
416416
/// ```
417417
///
418-
/// Here we would be invoked with `fr = 'a` and `outlived_fr = `'b`.
418+
/// Here we would be invoked with `fr = 'a` and `outlived_fr = 'b`.
419419
pub(crate) fn report_region_error(
420420
&mut self,
421421
fr: RegionVid,
@@ -949,7 +949,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
949949
.push_span_label(*span, "this has an implicit `'static` lifetime requirement");
950950
multi_span.push_span_label(
951951
ident.span,
952-
"calling this method introduces the `impl`'s 'static` requirement",
952+
"calling this method introduces the `impl`'s `'static` requirement",
953953
);
954954
err.subdiagnostic(RequireStaticErr::UsedImpl { multi_span });
955955
err.span_suggestion_verbose(

compiler/rustc_borrowck/src/region_infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
889889
/// from a universe it can't name; at present, the only way for
890890
/// this to be true is if `scc` outlives `'static`. This is
891891
/// actually stricter than necessary: ideally, we'd support bounds
892-
/// like `for<'a: 'b`>` that might then allow us to approximate
892+
/// like `for<'a: 'b>` that might then allow us to approximate
893893
/// `'a` with `'b` and not `'static`. But it will have to do for
894894
/// now.
895895
fn add_incompatible_universe(&mut self, scc: ConstraintSccIndex) {

compiler/rustc_borrowck/src/region_infer/values.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ pub(crate) struct RegionValues<N: Idx> {
235235
free_regions: SparseBitMatrix<N, RegionVid>,
236236

237237
/// Placeholders represent bound regions -- so something like `'a`
238-
/// in for<'a> fn(&'a u32)`.
238+
/// in `for<'a> fn(&'a u32)`.
239239
placeholders: SparseBitMatrix<N, PlaceholderIndex>,
240240
}
241241

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,8 +1814,6 @@ extern "C" {
18141814
/// Creates a legacy pass manager -- only used for final codegen.
18151815
pub fn LLVMCreatePassManager<'a>() -> &'a mut PassManager<'a>;
18161816

1817-
pub fn LLVMInitializePasses();
1818-
18191817
pub fn LLVMTimeTraceProfilerInitialize();
18201818

18211819
pub fn LLVMTimeTraceProfilerFinishThread();

compiler/rustc_codegen_llvm/src/llvm_util.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,6 @@ unsafe fn configure_llvm(sess: &Session) {
120120
llvm::LLVMTimeTraceProfilerInitialize();
121121
}
122122

123-
llvm::LLVMInitializePasses();
124-
125123
rustc_llvm::initialize_available_targets();
126124

127125
llvm::LLVMRustSetLLVMOptions(llvm_args.len() as c_int, llvm_args.as_ptr());

compiler/rustc_const_eval/src/interpret/intrinsics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
457457
assert_eq!(input_len, dest_len, "Return vector length must match input length");
458458
assert!(
459459
index < dest_len,
460-
"Index `{}` must be in bounds of vector with length {}`",
460+
"Index `{}` must be in bounds of vector with length {}",
461461
index,
462462
dest_len
463463
);
@@ -477,7 +477,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
477477
let (input, input_len) = self.operand_to_simd(&args[0])?;
478478
assert!(
479479
index < input_len,
480-
"index `{}` must be in bounds of vector with length `{}`",
480+
"index `{}` must be in bounds of vector with length {}",
481481
index,
482482
input_len
483483
);

compiler/rustc_const_eval/src/transform/check_consts/check.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
332332

333333
fn check_static(&mut self, def_id: DefId, span: Span) {
334334
if self.tcx.is_thread_local_static(def_id) {
335-
self.tcx.sess.delay_span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef");
335+
self.tcx.sess.delay_span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef`");
336336
}
337337
self.check_op_spanned(ops::StaticAccess, span)
338338
}

0 commit comments

Comments
 (0)