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 313db53

Browse files
committedAug 24, 2024·
Auto merge of rust-lang#129521 - matthiaskrgr:rollup-uigv77m, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang#128596 (stabilize const_fn_floating_point_arithmetic) - rust-lang#129199 (make writes_through_immutable_pointer a hard error) - rust-lang#129246 (Retroactively feature gate `ConstArgKind::Path`) - rust-lang#129290 (Pin `cc` to 1.0.105) - rust-lang#129323 (Implement `ptr::fn_addr_eq`) - rust-lang#129500 (remove invalid `TyCompat` relation for effects) - rust-lang#129501 (panicking: improve hint for Miri's RUST_BACKTRACE behavior) - rust-lang#129505 (interpret: ImmTy: tighten sanity checks in offset logic) - rust-lang#129510 (Fix `elided_named_lifetimes` in code) r? `@ghost` `@rustbot` modify labels: rollup
2 parents f167efa + e664ff5 commit 313db53

File tree

130 files changed

+651
-630
lines changed

Some content is hidden

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

130 files changed

+651
-630
lines changed
 

‎Cargo.lock

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,9 @@ version = "0.1.0"
410410

411411
[[package]]
412412
name = "cc"
413-
version = "1.1.13"
413+
version = "1.0.105"
414414
source = "registry+https://github.com/rust-lang/crates.io-index"
415-
checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
416-
dependencies = [
417-
"shlex",
418-
]
415+
checksum = "5208975e568d83b6b05cc0a063c8e7e9acc2b43bee6da15616a5b73e109d7437"
419416

420417
[[package]]
421418
name = "cfg-if"

‎compiler/rustc_ast_lowering/src/asm.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,9 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
220220
let parent_def_id = self.current_def_id_parent;
221221
let node_id = self.next_node_id();
222222
// HACK(min_generic_const_args): see lower_anon_const
223-
if !expr.is_potential_trivial_const_arg() {
223+
if !self.tcx.features().const_arg_path
224+
|| !expr.is_potential_trivial_const_arg()
225+
{
224226
self.create_def(
225227
parent_def_id,
226228
node_id,

0 commit comments

Comments
 (0)
This repository has been archived.