Auto merge of #135896 - matthiaskrgr:rollup-g6rv7za, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #132983 (Edit dangling pointers ) - #135409 (Fix ICE-133117: multiple never-pattern arm doesn't have false_edge_start_block) - #135557 (Point at invalid utf-8 span on user's source code) - #135596 (Properly note when query stack is being cut off) - #135794 (Detect missing fields with default values and suggest `..`) - #135814 (ci: use ghcr buildkit image) - #135826 (Misc. `rustc_resolve` cleanups) - #135837 (Remove test panic from File::open) - #135856 (Library: Finalize dyn compatibility renaming) r? `@ghost` `@rustbot` modify labels: rollup
This commit is contained in:
commit
a30f9151fe
55 changed files with 1081 additions and 684 deletions
|
|
@ -123,6 +123,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
|
|||
build_args+=("--build-arg" "SCRIPT_ARG=${DOCKER_SCRIPT}")
|
||||
fi
|
||||
|
||||
GHCR_BUILDKIT_IMAGE="ghcr.io/rust-lang/buildkit:buildx-stable-1"
|
||||
# On non-CI jobs, we try to download a pre-built image from the rust-lang-ci
|
||||
# ghcr.io registry. If it is not possible, we fall back to building the image
|
||||
# locally.
|
||||
|
|
@ -140,7 +141,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
|
|||
elif [[ "$PR_CI_JOB" == "1" ]];
|
||||
then
|
||||
# Enable a new Docker driver so that --cache-from works with a registry backend
|
||||
docker buildx create --use --driver docker-container
|
||||
# Use a custom image to avoid DockerHub rate limits
|
||||
docker buildx create --use --driver docker-container \
|
||||
--driver-opt image=${GHCR_BUILDKIT_IMAGE}
|
||||
|
||||
# Build the image using registry caching backend
|
||||
retry docker \
|
||||
|
|
@ -156,7 +159,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
|
|||
--password-stdin
|
||||
|
||||
# Enable a new Docker driver so that --cache-from/to works with a registry backend
|
||||
docker buildx create --use --driver docker-container
|
||||
# Use a custom image to avoid DockerHub rate limits
|
||||
docker buildx create --use --driver docker-container \
|
||||
--driver-opt image=${GHCR_BUILDKIT_IMAGE}
|
||||
|
||||
# Build the image using registry caching backend
|
||||
retry docker \
|
||||
|
|
|
|||
|
|
@ -101,6 +101,8 @@ pub fn load_errors(testfile: &Path, revision: Option<&str>) -> Vec<Error> {
|
|||
|
||||
rdr.lines()
|
||||
.enumerate()
|
||||
// We want to ignore utf-8 failures in tests during collection of annotations.
|
||||
.filter(|(_, line)| line.is_ok())
|
||||
.filter_map(|(line_num, line)| {
|
||||
parse_expected(last_nonfollow_error, line_num + 1, &line.unwrap(), revision).map(
|
||||
|(which, error)| {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ pub fn check(tests_path: impl AsRef<Path>, bad: &mut bool) {
|
|||
|
||||
let mut expected_revisions = BTreeSet::new();
|
||||
|
||||
let contents = std::fs::read_to_string(test).unwrap();
|
||||
let Ok(contents) = std::fs::read_to_string(test) else { continue };
|
||||
|
||||
// Collect directives.
|
||||
iter_header(&contents, &mut |HeaderLine { revision, directive, .. }| {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue