Auto merge of #156751 - JonathanBrouwer:rollup-jecv0TQ, r=JonathanBrouwer

Rollup of 6 pull requests

Successful merges:

 - #154265 (ci: Add dist-aarch64-freebsd)
 - #156739 (miri subtree update)
 - #148666 (Add support for xray in aarch64 unknown none targets)
 - #156547 (Move tests closures)
 - #156578 (Add FileCheck for build_correct_coerce)
 - #156734 ([rustdoc] Move `span_map` file to the right folder)

Author: bors

compiler/rustc_target/src/spec/targets/aarch64_unknown_none.rs

@@ -30,6 +30,7 @@ pub(crate) fn target() -> Target {
         stack_probes: StackProbeType::Inline,
         panic_strategy: PanicStrategy::Abort,
         default_uwtable: true,
+        supports_xray: true,
         ..Default::default()
     };
     Target {

compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs

@@ -27,6 +27,7 @@ pub(crate) fn target() -> Target {
         stack_probes: StackProbeType::Inline,
         panic_strategy: PanicStrategy::Abort,
         default_uwtable: true,
+        supports_xray: true,
         ..Default::default()
     };
     Target {

src/ci/docker/host-aarch64/dist-aarch64-freebsd/Dockerfile

@@ -0,0 +1,44 @@
+FROM ubuntu:26.04
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  clang \
+  make \
+  ninja-build \
+  file \
+  curl \
+  ca-certificates \
+  python3 \
+  git \
+  cmake \
+  sudo \
+  bzip2 \
+  xz-utils \
+  texinfo \
+  wget \
+  libssl-dev \
+  pkg-config \
+  && rm -rf /var/lib/apt/lists/*
+
+COPY scripts/freebsd-toolchain.sh /tmp/
+RUN /tmp/freebsd-toolchain.sh aarch64
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+COPY scripts/cmake.sh /scripts/
+RUN /scripts/cmake.sh
+
+ENV \
+    AR_aarch64_unknown_freebsd=aarch64-unknown-freebsd14-ar \
+    CC_aarch64_unknown_freebsd=aarch64-unknown-freebsd14-clang \
+    CXX_aarch64_unknown_freebsd=aarch64-unknown-freebsd14-clang++
+
+ENV HOSTS=aarch64-unknown-freebsd
+
+ENV RUST_CONFIGURE_ARGS="--enable-full-tools \
+    --enable-extended \
+    --enable-profiler \
+    --enable-sanitizers \
+    --disable-docs"
+
+ENV SCRIPT="python3 ../x.py dist --host $HOSTS --target $HOSTS"

src/ci/docker/scripts/freebsd-toolchain.sh

@@ -46,6 +46,7 @@ mkdir -p "$sysroot"
 case $arch in
   (x86_64) freebsd_arch=amd64 ;;
   (i686) freebsd_arch=i386 ;;
+  (aarch64) freebsd_arch=arm64 ;;
 esac
 
 files_to_extract=(

src/ci/github-actions/jobs.yml

@@ -261,6 +261,9 @@ auto:
   - name: dist-x86_64-freebsd
     <<: *job-linux-4c
 
+  - name: dist-aarch64-freebsd
+    <<: *job-aarch64-linux
+
   - name: dist-x86_64-illumos
     <<: *job-linux-4c
 

src/doc/unstable-book/src/compiler-flags/instrument-xray.md

@@ -37,3 +37,4 @@ which on their own don't do anything useful.
 In order to actually trace the functions,
 you will need to link a separate runtime library of your choice,
 such as Clang's [XRay Runtime Library](https://www.llvm.org/docs/XRay.html#xray-runtime-library).
+On targets where such a runtime is not available but instrumentation is supported, you must supply and link your own runtime library.

src/librustdoc/html/highlight.rs

@@ -23,8 +23,8 @@ use crate::display::Joined as _;
 use crate::html::escape::EscapeBodyText;
 use crate::html::format::HrefInfo;
 use crate::html::macro_expansion::ExpandedCode;
-use crate::html::render::span_map::{DUMMY_SP, Span};
-use crate::html::render::{Context, LinkFromSrc};
+use crate::html::render::Context;
+use crate::html::span_map::{DUMMY_SP, LinkFromSrc, Span};
 
 /// This type is needed in case we want to render links on items to allow to go to their definition.
 pub(crate) struct HrefContext<'a, 'tcx> {

src/librustdoc/html/mod.rs

@@ -8,6 +8,7 @@ pub(crate) mod macro_expansion;
 pub mod markdown;
 pub(crate) mod render;
 pub(crate) mod sources;
+pub(crate) mod span_map;
 pub(crate) mod static_files;
 pub(crate) mod toc;
 mod url_parts_builder;

src/librustdoc/html/render/context.rs

@@ -20,7 +20,7 @@ use tracing::info;
 
 use super::print_item::{full_path, print_item, print_item_path, print_ty_path};
 use super::sidebar::{ModuleLike, Sidebar, print_sidebar, sidebar_module_like};
-use super::{AllTypes, LinkFromSrc, StylePath, collect_spans_and_sources, scrape_examples_help};
+use super::{AllTypes, StylePath, scrape_examples_help};
 use crate::clean::types::ExternalLocation;
 use crate::clean::utils::has_doc_flag;
 use crate::clean::{self, ExternalCrate};
@@ -33,8 +33,8 @@ use crate::formats::item_type::ItemType;
 use crate::html::escape::Escape;
 use crate::html::macro_expansion::ExpandedCode;
 use crate::html::markdown::{self, ErrorCodes, IdMap, plain_text_summary};
-use crate::html::render::span_map::Span;
 use crate::html::render::write_shared::write_shared;
+use crate::html::span_map::{LinkFromSrc, Span, collect_spans_and_sources};
 use crate::html::url_parts_builder::UrlPartsBuilder;
 use crate::html::{layout, sources, static_files};
 use crate::scrape_examples::AllCallLocations;

src/librustdoc/html/render/mod.rs

@@ -36,7 +36,6 @@ mod ordered_json;
 mod print_item;
 pub(crate) mod sidebar;
 mod sorted_template;
-pub(crate) mod span_map;
 mod type_layout;
 mod write_shared;
 
@@ -64,7 +63,6 @@ use rustc_span::symbol::{Symbol, sym};
 use tracing::{debug, info};
 
 pub(crate) use self::context::*;
-pub(crate) use self::span_map::{LinkFromSrc, collect_spans_and_sources};
 pub(crate) use self::write_shared::*;
 use crate::clean::{self, Defaultness, Item, ItemId, RenderedLink};
 use crate::display::{Joined as _, MaybeDisplay as _};