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 101e182

Browse files
committedNov 15, 2022
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,

0 commit comments

Comments
 (0)
This repository has been archived.