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.

Sign up for GitHub

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

Jump to bottom

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

Merged

bors merged 1 commit into rust-lang:master from michaelwoerister:issue83045

Mar 26, 2021

Member

michaelwoerister commented Mar 23, 2021

rust-highfive assigned eddyb

rust-highfive added the S-waiting-on-review label

petrochenkov self-assigned this

jyn514 added the T-compiler label

petrochenkov removed their assignment

eddyb approved these changes

View reviewed changes

eddyb reviewed

View reviewed changes

src/test/run-make/issue-83045/Makefile Outdated

    
              	$(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

Member

eddyb Mar 24, 2021

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

Member Author

michaelwoerister Mar 25, 2021

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

Member

eddyb commented Mar 24, 2021

r=me with CI fixed

michaelwoerister force-pushed the issue83045 branch from 753a697 to 4ab0434 Compare

March 25, 2021 10:14

This comment has been minimized.

Sign in to view

michaelwoerister force-pushed the issue83045 branch from 4ab0434 to 416c555 Compare

March 25, 2021 12:40

This comment has been minimized.

Sign in to view

Member Author

michaelwoerister commented Mar 25, 2021

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 :(

michaelwoerister force-pushed the issue83045 branch from 416c555 to 03f8ee6 Compare

March 25, 2021 13:46

This comment has been minimized.

Sign in to view

michaelwoerister force-pushed the issue83045 branch from 03f8ee6 to 6de2a61 Compare

March 25, 2021 14:23

This comment has been minimized.

Sign in to view

michaelwoerister force-pushed the issue83045 branch from 6de2a61 to cac9eef Compare

March 25, 2021 15:02

This comment has been minimized.

Sign in to view

michaelwoerister force-pushed the issue83045 branch from cac9eef to 7d7c047 Compare

March 26, 2021 06:23

This comment has been minimized.

Sign in to view


          Fix rust-lang#83045 by moving some crate loading verification code to…

09bab38

… a better place.

michaelwoerister force-pushed the issue83045 branch from 7d7c047 to 09bab38 Compare

March 26, 2021 08:59

Member Author

michaelwoerister commented Mar 26, 2021

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

Contributor

bors commented Mar 26, 2021

📌 Commit 09bab38 has been approved by eddyb

bors added S-waiting-on-bors and removed S-waiting-on-review labels

Contributor

bors commented Mar 26, 2021

⌛ Testing commit 09bab38 with merge b8719c5...

Contributor

bors commented Mar 26, 2021

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

bors added the merged-by-bors label

bors merged commit b8719c5 into rust-lang:master

rustbot added this to the 1.53.0 milestone

JohnTitor mentioned this pull request

ICE when trying to link against an rlib compiled against a different sysroot #83138

Closed

ehuss mentioned this pull request

Failed to get crate data for crate18' #85370

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors S-waiting-on-bors T-compiler