Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include a header in .rlink files #95589

Merged
merged 2 commits into from
Apr 2, 2022
Merged

Include a header in .rlink files #95589

merged 2 commits into from
Apr 2, 2022

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Apr 2, 2022

I couldn't find the right place where to put tests. Is there some location that tests .rlink creation and loading?
I only found src/test/run-make-fulldeps/separate-link/Makefile, but I'm not sure how to check the error message in the Makefile.

Fixes: #95297

r? @bjorn3

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Apr 2, 2022
@rust-highfive
Copy link
Collaborator

r? @wesleywiser

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 2, 2022
@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 2, 2022

r? @bjorn3

@rust-highfive rust-highfive assigned bjorn3 and unassigned wesleywiser Apr 2, 2022
@bjorn3
Copy link
Member

bjorn3 commented Apr 2, 2022

I only found src/test/run-make-fulldeps/separate-link/Makefile, but I'm not sure how to check the error message in the Makefile.

You can use something like $(CGREP) "the error message" < rustc_stderr.txt after capturing the stderr output using rustc ... 2>rustc_stderr.txt.

@rust-log-analyzer

This comment has been minimized.

Copy link
Member

@bjorn3 bjorn3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once CI passes

@bjorn3
Copy link
Member

bjorn3 commented Apr 2, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Apr 2, 2022

📌 Commit b81d873 has been approved by bjorn3

@bors bors 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 Apr 2, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2022
Rollup of 4 pull requests

Successful merges:

 - rust-lang#95587 (Remove need for associated_type_bounds in std.)
 - rust-lang#95589 (Include a header in .rlink files)
 - rust-lang#95593 (diagnostics: add test case for bogus T:Sized suggestion)
 - rust-lang#95597 (Refer to u8 by absolute path in expansion of thread_local)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 30c0738 into rust-lang:master Apr 2, 2022
@bors
Copy link
Contributor

bors commented Apr 2, 2022

⌛ Testing commit b81d873 with merge 76d770a...

@rustbot rustbot added this to the 1.61.0 milestone Apr 2, 2022
@Kobzol Kobzol deleted the rlink-header branch April 3, 2022 07:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add version header to -Zno-link .rlink files
7 participants