Skip to content

Patch --extern arguments in phase_cargo_rustc as well#1710

Merged
bors merged 5 commits into
masterfrom
unknown repository
Feb 15, 2021
Merged

Patch --extern arguments in phase_cargo_rustc as well#1710
bors merged 5 commits into
masterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Feb 14, 2021 •
edited by ghost
Loading

Fixes #1705.

@RalfJung
Copy link
Copy Markdown
Member

RalfJung commented Feb 14, 2021

This contains #1671 now

Can you just take the relevant parts of that PR, i.e. forward_patched_extern_arg? I'd prefer to review these separately.

ghost
ghost commented Feb 14, 2021
View reviewed changes
Copy link
Copy Markdown
Author

@ghost ghost left a comment

Choose a reason for hiding this comment

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

Can you just take the relevant parts of that PR, i.e. forward_patched_extern_arg? I'd prefer to review these separately.

Sure. Starting to rebase now...

Comment thread cargo-miri/bin.rs
Comment thread test-cargo-miri/issue-1705/src/lib.rs
RalfJung
RalfJung reviewed Feb 14, 2021
View reviewed changes
Comment thread cargo-miri/bin.rs Outdated
RalfJung
RalfJung reviewed Feb 14, 2021
View reviewed changes
Comment thread cargo-miri/bin.rs Outdated
RalfJung
RalfJung reviewed Feb 14, 2021
View reviewed changes
Comment thread test-cargo-miri/src/lib.rs Outdated
@RalfJung
Copy link
Copy Markdown
Member

RalfJung commented Feb 15, 2021

Looks good. :) It is still marked as a draft though, is there something you still wanted to do?

Also, maybe squash the history a bit; no need to preserve all those 9 commits I think.

@ghost
Copy link
Copy Markdown
Author

ghost commented Feb 15, 2021

It is still marked as a draft though, is there something you still wanted to do?

I'm just not sure where forward_patched_extern_arg() belongs to (it could also be in #1671 and maybe that could be merged first).

@ghost ghost marked this pull request as ready for review February 15, 2021 12:46
@RalfJung
Copy link
Copy Markdown
Member

RalfJung commented Feb 15, 2021

#1671 isn't quite ready yet and I'd prefer not to block this fix on that PR.

Thanks for yet another cargo-miri fix :)
@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Feb 15, 2021

📌 Commit 1923044 has been approved by RalfJung

@bors
Copy link
Copy Markdown
Contributor

bors commented Feb 15, 2021

⌛ Testing commit 1923044 with merge b5b5df5...

@bors
Copy link
Copy Markdown
Contributor

bors commented Feb 15, 2021

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing b5b5df5 to master...

@bors bors merged commit b5b5df5 into rust-lang:master Feb 15, 2021
@bors bors mentioned this pull request Feb 15, 2021
Closed
@ghost ghost deleted the crate-types branch February 15, 2021 14:26
@RalfJung RalfJung mentioned this pull request Nov 2, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Can't find crate with hyper crate as a dependency

2 participants

@RalfJung @bors