Skip to content

Commit ec775c1

Browse files
authored
Merge pull request #4527 from rust-lang/rustup-2025-08-15
Automatic Rustup
2 parents 2d473f6 + d00466c commit ec775c1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1553adfe6884a8f6c28f5a673d3e605535ee0113
1+
3507a749b365aae4eefa96ab700a9315d3280ee7

src/helpers.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ pub enum AccessKind {
3232
///
3333
/// A `None` namespace indicates we are looking for a module.
3434
fn try_resolve_did(tcx: TyCtxt<'_>, path: &[&str], namespace: Option<Namespace>) -> Option<DefId> {
35+
let _trace = enter_trace_span!("try_resolve_did", ?path);
36+
3537
/// Yield all children of the given item, that have the given name.
3638
fn find_children<'tcx: 'a, 'a>(
3739
tcx: TyCtxt<'tcx>,

src/shims/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,8 +322,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
322322

323323
// Since our emulated ticks in `mach_absolute_time` *are* nanoseconds,
324324
// no scaling needs to happen.
325-
let (numer, denom) = (1, 1);
326-
this.write_int_fields(&[numer.into(), denom.into()], &info)?;
325+
let (numerator, denom) = (1, 1);
326+
this.write_int_fields(&[numerator.into(), denom.into()], &info)?;
327327

328328
interp_ok(Scalar::from_i32(0)) // KERN_SUCCESS
329329
}

0 commit comments

Comments
 (0)