Skip to content

[beta] backports#159791

Merged
rust-bors[bot] merged 3 commits into
rust-lang:betafrom
cuviper:beta-next
Jul 25, 2026
Merged

[beta] backports#159791
rust-bors[bot] merged 3 commits into
rust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper

@cuviper cuviper commented Jul 23, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

r? me

mejrs and others added 2 commits July 23, 2026 12:58
@mejrs @cuviper
Fix string indexing in diagnostic format strings
d78e39c 
(cherry picked from commit d61c706)
@LorrensP-2158466 @cuviper
When recording traits, if a decl is ambiguous we make sure to record …
625edb6 
…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.

Also updated the issue linked by the lint.

+ added extra test
+ bless original test because of updated link

(cherry picked from commit 73ed271)
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 23, 2026
@cuviper

cuviper commented Jul 23, 2026

Copy link
Copy Markdown
Member Author

@bors r+ rollup=never

@rust-bors

rust-bors Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 625edb6 has been approved by cuviper

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 23, 2026
@cuviper
Set the rustc lib path for unstable-book-gen
3eda017 
When configured with `rust.rpath = false` or using any other custom
library configurations, running `rustc` requires a library path too.
This was missing from `unstable-book-gen`'s new `rustc -Zhelp`.

(cherry picked from commit 8c6aba0)
@rust-bors rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 24, 2026
@rust-bors

rust-bors Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

⚠️ A new commit 3eda017460b2757214c2c60a786bd35287448c13 was pushed.

This pull request was unapproved.

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jul 24, 2026
@cuviper

cuviper commented Jul 24, 2026

Copy link
Copy Markdown
Member Author

@bors r+

@rust-bors

rust-bors Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3eda017 has been approved by cuviper

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 24, 2026
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Jul 24, 2026
@bors
Auto merge of #159791 - cuviper:beta-next, r=cuviper
0af007c 
[beta] backports

- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613

r? me
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 24, 2026
@rust-bors

rust-bors Bot commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 0af007c failed: CI. Failed job:

@jhpratt

jhpratt commented Jul 24, 2026

Copy link
Copy Markdown
Member

@bors retry

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 24, 2026
@jhpratt

jhpratt commented Jul 25, 2026

Copy link
Copy Markdown
Member

@bors p=6 scheduling

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Jul 25, 2026
@bors
Auto merge of #159791 - cuviper:beta-next, r=cuviper
0fda505 
[beta] backports

- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613

r? me
@rust-log-analyzer

rust-log-analyzer commented Jul 25, 2026

Copy link
Copy Markdown
Collaborator

The job x86_64-mingw-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
---- [run-make] tests\run-make-cargo\amdgpu-lto stdout ----

error: rmake recipe failed to complete
status: exit code: 1
command: "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make-cargo\\amdgpu-lto\\rmake.exe"
stdout: none
--- stderr -------------------------------
command failed at line 27
"D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\stage2-tools-bin\\cargo.exe" "build" "--release" "--lib" "--manifest-path" "Cargo.toml" "-Zbuild-std=core" "--target" "amdgcn-amd-amdhsa"
output status: `exit code: 101`
---
    Blocking waiting for file lock on package cache
    Blocking waiting for file lock on package cache
   Compiling compiler_builtins v0.1.160 (D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage2\lib\rustlib\src\rust\library\compiler-builtins\compiler-builtins)
   Compiling core v0.0.0 (D:\a\rust\rust\build\x86_64-pc-windows-gnu\stage2\lib\rustlib\src\rust\library\core)
   Compiling amdgpu_lto v0.1.0 (D:\a\rust\rust\build\x86_64-pc-windows-gnu\test\run-make-cargo\amdgpu-lto\rmake_out)
error: linking with `rust-lld` failed: exit code: 0xc0000374
  |
  = note: "rust-lld" "-flavor" "gnu" "--version-script=D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make-cargo\\amdgpu-lto\\rmake_out\\target\\amdgcn-amd-amdhsa\\release\\deps\\rustceFC6Ue\\list" "--no-undefined-version" "<1 object files omitted>" "--as-needed" "-L" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make-cargo\\amdgpu-lto\\rmake_out\\target\\amdgcn-amd-amdhsa\\release\\deps\\rustceFC6Ue\\raw-dylibs" "-Bdynamic" "--eh-frame-hdr" "-z" "noexecstack" "-o" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-gnu\\test\\run-make-cargo\\amdgpu-lto\\rmake_out\\target\\amdgcn-amd-amdhsa\\release\\deps\\amdgpu_lto.elf" "--gc-sections" "-shared" "-O1" "--strip-debug"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: 

error: could not compile `amdgpu_lto` (lib) due to 1 previous error
------------------------------------------

---- [run-make] tests\run-make-cargo\amdgpu-lto stdout end ----

failures:
    [run-make] tests\run-make-cargo\amdgpu-lto

test result: FAILED. 6 passed; 1 failed; 6 ignored; 0 measured; 1 filtered out; finished in 92.23s

Some tests failed in compiletest suite=run-make-cargo mode=run-make host=x86_64-pc-windows-gnu target=x86_64-pc-windows-gnu
Bootstrap failed while executing `test --stage 2 --skip=compiler --skip=src`
Build completed unsuccessfully in 2:08:09
make: *** [Makefile:126: ci-mingw-x] Error 1
  local time: Sat Jul 25 03:33:20 CUT 2026
  network time: Sat, 25 Jul 2026 03:33:20 GMT
##[error]Process completed with exit code 2.
##[group]Run echo "disk usage:"
echo "disk usage:"

@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 25, 2026
@rust-bors

rust-bors Bot commented Jul 25, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 0fda505 failed: CI. Failed job:

@jhpratt

jhpratt commented Jul 25, 2026

Copy link
Copy Markdown
Member

A search of the error code quickly leads to #115985, which indicates it's spurious

@bors retry

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 25, 2026
@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 25, 2026
@rust-bors

rust-bors Bot commented Jul 25, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: cuviper
Duration: 3h 25m 39s
Pushing 0c45ca3 to beta...

@rust-bors
rust-bors Bot merged commit 0c45ca3 into rust-lang:beta Jul 25, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jul 25, 2026
@theemathas theemathas mentioned this pull request Jul 25, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cuviper cuviper

Labels

merged-by-bors This PR was explicitly merged by bors. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.98.0

Development

Successfully merging this pull request may close these issues.

6 participants

@cuviper @jhpratt @rust-log-analyzer @rustbot @mejrs @LorrensP-2158466