Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 8c0b4f6

Browse files
committedFeb 5, 2024
Auto merge of #120660 - matthiaskrgr:rollup-zuqljul, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #119481 (Clarify ambiguity in select_nth_unstable docs) - #119600 (Remove outdated references to librustc_middle) - #120458 (Document `&CStr` to `CString` conversion) - #120569 (coverage: Improve handling of function/closure spans) - #120572 (Update libc to 0.2.153) - #120587 (miri: normalize struct tail in ABI compat check) - #120607 (fix #120603 by adding a check in default_read_buf) - #120636 (Subtree update of `rust-analyzer`) - #120641 (rustdoc: trait.impl, type.impl: sort impls to make it not depend on serialization order) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0984bec + a2d3eed commit 8c0b4f6

File tree

228 files changed

+3480
-2121
lines changed

Some content is hidden

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

228 files changed

+3480
-2121
lines changed
 

‎Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,9 +2169,9 @@ checksum = "db13adb97ab515a3691f56e4dbab09283d0b86cb45abd991d8634a9d6f501760"
21692169

21702170
[[package]]
21712171
name = "libc"
2172-
version = "0.2.150"
2172+
version = "0.2.153"
21732173
source = "registry+https://github.com/rust-lang/crates.io-index"
2174-
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
2174+
checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
21752175
dependencies = [
21762176
"rustc-std-workspace-core",
21772177
]

‎compiler/rustc_const_eval/src/const_eval/error.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ impl MachineStopType for ConstEvalErrKind {
4949
}
5050
}
5151

52-
// The errors become `MachineStop` with plain strings when being raised.
53-
// `ConstEvalErr` (in `librustc_middle/mir/interpret/error.rs`) knows to
54-
// handle these.
52+
/// The errors become [`InterpError::MachineStop`] when being raised.
5553
impl<'tcx> Into<InterpErrorInfo<'tcx>> for ConstEvalErrKind {
5654
fn into(self) -> InterpErrorInfo<'tcx> {
5755
err_machine_stop!(self).into()

0 commit comments

Comments
 (0)
Please sign in to comment.