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

Replace target.target with target #1583

Merged
merged 1 commit into from
Oct 15, 2020
Merged

Conversation

est31
Copy link
Member

@est31 est31 commented Oct 14, 2020

Fix fallout caused by rustc PR: rust-lang/rust#77943

Fixes rust-lang/rust#77988

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2020
No more target.target

Two main changes of this PR:

* Turn `target_pointer_width` into an integer and rename to `pointer_width`.
  The compiler only allowed three valid values for the width anyways.
  An integer is more natural for this value, and saves a few allocations
  and copies.
* Remove the `rustc_session::config::Config` wrapper and replace it with
  its inner member `Target`. Aka. no more `target.target`. This makes life so
  much easier, but it also causes a ton of downstream breakage.

Some changes of this PR were done using tooling. These tooling-made changes
were isolated to their own commits to make review easier.
It's best to review the PR commit-by-commit.

Miri PR: rust-lang/miri#1583

I request p=10 bors priority because of the breakage.
Rustc removed the target wrapper and exposed the target directly.

Result of running:

find . -type f -exec sed -i -e 's/target\.target\([)\.,;]\)/target\1/g' {} \;

Plus one manual edit of the rust-version file
@RalfJung
Copy link
Member

Thanks. :)
@bors r+

@bors
Copy link
Collaborator

bors commented Oct 15, 2020

📌 Commit 1ae157b has been approved by RalfJung

@bors
Copy link
Collaborator

bors commented Oct 15, 2020

⌛ Testing commit 1ae157b with merge 1b3a27c...

@bors
Copy link
Collaborator

bors commented Oct 15, 2020

☀️ Test successful - checks-actions, checks-travis, status-appveyor
Approved by: RalfJung
Pushing 1b3a27c to master...

@bors bors merged commit 1b3a27c into rust-lang:master Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

miri no longer builds after rust-lang/rust#77943
3 participants