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

Fix #83045 by moving some crate loading verification code to a better place #83404

Merged
merged 1 commit into from
Mar 26, 2021

Conversation

michaelwoerister
Copy link
Member

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2021
@petrochenkov petrochenkov self-assigned this Mar 23, 2021
@jyn514 jyn514 added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 23, 2021
@petrochenkov petrochenkov removed their assignment Mar 23, 2021
$(BARE_RUSTC) --out-dir $(TMPDIR) --extern b=$(TMPDIR)/libb.rlib --crate-type=rlib \
--edition=2018 c.rs &> $(TMPDIR)/output.txt || exit 0
# Check that we get the expected error message
$(CGREP) "error[E0463]" < $(TMPDIR)/output.txt
Copy link
Member

Choose a reason for hiding this comment

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

You probably need backslashes for the [ and ]?
Might be easier to match on the message itself which is:

can't find crate for `a` which `b` depends on

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll just match on E0463. That should be sufficient.

@eddyb
Copy link
Member

eddyb commented Mar 24, 2021

r=me with CI fixed

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@michaelwoerister
Copy link
Member Author

I don't understand what's going on here. The string to be matched is right there in the output and the test passes for me locally :(

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@michaelwoerister
Copy link
Member Author

OK, piping the compiler's output through tee seems to have fixed the test case. I don't even want to know...

@bors r=eddyb

@bors
Copy link
Contributor

bors commented Mar 26, 2021

📌 Commit 09bab38 has been approved by eddyb

@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 Mar 26, 2021
@bors
Copy link
Contributor

bors commented Mar 26, 2021

⌛ Testing commit 09bab38 with merge b8719c5...

@bors
Copy link
Contributor

bors commented Mar 26, 2021

☀️ Test successful - checks-actions
Approved by: eddyb
Pushing b8719c5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

8 participants