Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 101e182

Browse files
committed
Auto merge of rust-lang#104418 - matthiaskrgr:rollup-y4i6xjc, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang#101967 (Move `unix_socket_abstract` feature API to `SocketAddrExt`.) - rust-lang#102470 (Stabilize const char convert) - rust-lang#104223 (Recover from function pointer types with generic parameter list) - rust-lang#104229 (Don't print full paths in overlap errors) - rust-lang#104294 (Don't ICE with inline const errors during MIR build) - rust-lang#104332 (Fixed some `_i32` notation in `maybe_uninit`’s doc) - rust-lang#104349 (fix some typos in comments) - rust-lang#104350 (Fix x finding Python on Windows) - rust-lang#104356 (interpret: make check_mplace public) - rust-lang#104364 (rustdoc: Resolve doc links in external traits having local impls) - rust-lang#104378 (Bump chalk to v0.87) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents dedfb9c + c389097 commit 101e182

File tree

82 files changed

+647
-419
lines changed

Some content is hidden

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

82 files changed

+647
-419
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@ dependencies = [
502502

503503
[[package]]
504504
name = "chalk-derive"
505-
version = "0.80.0"
505+
version = "0.87.0"
506506
source = "registry+https://github.com/rust-lang/crates.io-index"
507-
checksum = "d0001adf0cf12361e08b65e1898ea138f8f77d8f5177cbf29b6b3b3532252bd6"
507+
checksum = "d552b2fa341f5fc35c6b917b1d289d3c3a34d0b74e579390ea6192d6152a8cdb"
508508
dependencies = [
509509
"proc-macro2",
510510
"quote",
@@ -514,9 +514,9 @@ dependencies = [
514514

515515
[[package]]
516516
name = "chalk-engine"
517-
version = "0.80.0"
517+
version = "0.87.0"
518518
source = "registry+https://github.com/rust-lang/crates.io-index"
519-
checksum = "c44ee96f2d67cb5193d1503f185db1abad9933a1c6e6b4169c176f90baecd393"
519+
checksum = "7e54ac43048cb31c470d7b3e3acd409090ef4a5abddfe02455187aebc3d6879f"
520520
dependencies = [
521521
"chalk-derive",
522522
"chalk-ir",
@@ -527,9 +527,9 @@ dependencies = [
527527

528528
[[package]]
529529
name = "chalk-ir"
530-
version = "0.80.0"
530+
version = "0.87.0"
531531
source = "registry+https://github.com/rust-lang/crates.io-index"
532-
checksum = "92d8a95548f23618fda86426e4304e563ec2bb7ba0216139f0748d63c107b5f1"
532+
checksum = "43aa55deff4e7fbdb09fa014543372f2c95a06835ac487b9ce57b5099b950838"
533533
dependencies = [
534534
"bitflags",
535535
"chalk-derive",
@@ -538,9 +538,9 @@ dependencies = [
538538

539539
[[package]]
540540
name = "chalk-solve"
541-
version = "0.80.0"
541+
version = "0.87.0"
542542
source = "registry+https://github.com/rust-lang/crates.io-index"
543-
checksum = "f37f492dacfafe2e21319b80827da2779932909bb392f0cc86b2bd5c07c1b4e1"
543+
checksum = "61213deefc36ba265ad01c4d997e18bcddf7922862a4594a47ca4575afb3dab4"
544544
dependencies = [
545545
"chalk-derive",
546546
"chalk-ir",

compiler/rustc_const_eval/src/interpret/operand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
376376

377377
/// Read an immediate from a place, asserting that that is possible with the given layout.
378378
///
379-
/// If this suceeds, the `ImmTy` is never `Uninit`.
379+
/// If this succeeds, the `ImmTy` is never `Uninit`.
380380
#[inline(always)]
381381
pub fn read_immediate(
382382
&self,

compiler/rustc_const_eval/src/interpret/place.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,7 @@ where
316316
Ok(MPlaceTy { mplace, layout, align })
317317
}
318318

319-
/// Take an operand, representing a pointer, and dereference it to a place -- that
320-
/// will always be a MemPlace. Lives in `place.rs` because it creates a place.
319+
/// Take an operand, representing a pointer, and dereference it to a place.
321320
#[instrument(skip(self), level = "debug")]
322321
pub fn deref_operand(
323322
&self,
@@ -331,7 +330,7 @@ where
331330
}
332331

333332
let mplace = self.ref_to_mplace(&val)?;
334-
self.check_mplace_access(mplace, CheckInAllocMsg::DerefTest)?;
333+
self.check_mplace(mplace)?;
335334
Ok(mplace)
336335
}
337336

@@ -358,17 +357,18 @@ where
358357
}
359358

360359
/// Check if this mplace is dereferenceable and sufficiently aligned.
361-
fn check_mplace_access(
362-
&self,
363-
mplace: MPlaceTy<'tcx, M::Provenance>,
364-
msg: CheckInAllocMsg,
365-
) -> InterpResult<'tcx> {
360+
pub fn check_mplace(&self, mplace: MPlaceTy<'tcx, M::Provenance>) -> InterpResult<'tcx> {
366361
let (size, align) = self
367362
.size_and_align_of_mplace(&mplace)?
368363
.unwrap_or((mplace.layout.size, mplace.layout.align.abi));
369364
assert!(mplace.align <= align, "dynamic alignment less strict than static one?");
370365
let align = M::enforce_alignment(self).then_some(align);
371-
self.check_ptr_access_align(mplace.ptr, size, align.unwrap_or(Align::ONE), msg)?;
366+
self.check_ptr_access_align(
367+
mplace.ptr,
368+
size,
369+
align.unwrap_or(Align::ONE),
370+
CheckInAllocMsg::DerefTest,
371+
)?;
372372
Ok(())
373373
}
374374

compiler/rustc_error_messages/locales/en-US/parser.ftl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,3 +375,12 @@ parser_async_move_order_incorrect = the order of `move` and `async` is incorrect
375375
376376
parser_double_colon_in_bound = expected `:` followed by trait or lifetime
377377
.suggestion = use single colon
378+
379+
parser_fn_ptr_with_generics = function pointer types may not have generic parameters
380+
.suggestion = consider moving the lifetime {$arity ->
381+
[one] parameter
382+
*[other] parameters
383+
} to {$for_param_list_exists ->
384+
[true] the
385+
*[false] a
386+
} `for` parameter list

compiler/rustc_errors/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,6 +1254,10 @@ impl HandlerInner {
12541254
}
12551255

12561256
if diagnostic.has_future_breakage() {
1257+
// Future breakages aren't emitted if they're Level::Allowed,
1258+
// but they still need to be constructed and stashed below,
1259+
// so they'll trigger the good-path bug check.
1260+
self.suppressed_expected_diag = true;
12571261
self.future_breakage_diagnostics.push(diagnostic.clone());
12581262
}
12591263

compiler/rustc_expand/src/mbe/macro_rules.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ fn expand_macro<'cx>(
333333
assert!(try_success_result.is_err(), "Macro matching returned a success on the second try");
334334

335335
if let Some(result) = tracker.result {
336-
// An irrecoverable error occured and has been emitted.
336+
// An irrecoverable error occurred and has been emitted.
337337
return result;
338338
}
339339

compiler/rustc_feature/src/builtin_attrs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ pub enum AttributeDuplicates {
147147
FutureWarnPreceding,
148148
}
149149

150-
/// A conveniece macro to deal with `$($expr)?`.
150+
/// A convenience macro to deal with `$($expr)?`.
151151
macro_rules! or_default {
152152
($default:expr,) => {
153153
$default

compiler/rustc_hir_typeck/src/closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct ClosureSignatures<'tcx> {
3535
bound_sig: ty::PolyFnSig<'tcx>,
3636
/// The signature within the function body.
3737
/// This mostly differs in the sense that lifetimes are now early bound and any
38-
/// opaque types from the signature expectation are overriden in case there are
38+
/// opaque types from the signature expectation are overridden in case there are
3939
/// explicit hidden types written by the user in the closure signature.
4040
liberated_sig: ty::FnSig<'tcx>,
4141
}

compiler/rustc_lint/src/types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ fn lint_int_literal<'tcx>(
360360
}
361361

362362
if lint_overflowing_range_endpoint(cx, lit, v, max, e, t.name_str()) {
363-
// The overflowing literal lint was emited by `lint_overflowing_range_endpoint`.
363+
// The overflowing literal lint was emitted by `lint_overflowing_range_endpoint`.
364364
return;
365365
}
366366

@@ -429,7 +429,7 @@ fn lint_uint_literal<'tcx>(
429429
}
430430
}
431431
if lint_overflowing_range_endpoint(cx, lit, lit_val, max, e, t.name_str()) {
432-
// The overflowing literal lint was emited by `lint_overflowing_range_endpoint`.
432+
// The overflowing literal lint was emitted by `lint_overflowing_range_endpoint`.
433433
return;
434434
}
435435
if let Some(repr_str) = get_bin_hex_repr(cx, lit) {

compiler/rustc_middle/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ doctest = false
88

99
[dependencies]
1010
bitflags = "1.2.1"
11-
chalk-ir = "0.80.0"
11+
chalk-ir = "0.87.0"
1212
either = "1.5.0"
1313
gsgdt = "0.1.2"
1414
polonius-engine = "0.13.0"

0 commit comments

Comments
 (0)