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

[beta] backports #76852

Merged
merged 7 commits into from
Sep 18, 2020
Merged

[beta] backports #76852

merged 7 commits into from
Sep 18, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Sep 17, 2020

This also bumps to the released stable compiler.

tesuji and others added 7 commits September 17, 2020 16:16
These tests will fall without the next commit.
Apply suggestions from code review

Co-authored-by: Joshua Nelson <[email protected]>
CDB doesn't care that you're using static_cast between unrelated types.
VS(C) does.  These should've been reinterpret_cast or C casts.
Cast is from e.g. `u8*` to `tuple<$T1, $T2>*`
Issue rust-lang#74616 tracks a backwards-compatibility hack for certain macros.
This has is implemented by hard-coding the filenames and macro names of
certain code that we want to continue to compile.

However, the initial implementation of the hack was based on the
directory structure when building the crate from its repository (e.g.
`js-sys/src/lib.rs`). When the crate is build as a dependency, it will
include a version number from the clone from the cargo registry (e.g.
`js-sys-0.3.17/src/lib.rs`), which would fail the check.

This commit modifies the backwards-compatibility hack to check that
desired crate name (`js-sys` or `time-macros-impl`) is a prefix of the
proper part of the path.

See rust-lang#76070 (comment)
for more details.
@jyn514
Copy link
Member

jyn514 commented Sep 17, 2020

@Mark-Simulacrum #75953 was already backported in #76032.

@Mark-Simulacrum
Copy link
Member Author

Ah, okay -- I thought I had re-cherry-picked twice when I was told my cherry pick was empty, but I guess that's why :)

Adjusted the description.

@bors r+

@bors
Copy link
Contributor

bors commented Sep 17, 2020

📌 Commit 557e2bc has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 17, 2020
@Mark-Simulacrum
Copy link
Member Author

@bors rollup=never

@bors
Copy link
Contributor

bors commented Sep 17, 2020

⌛ Testing commit 557e2bc with merge 755064b...

@bors
Copy link
Contributor

bors commented Sep 18, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 755064b to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 18, 2020
@bors bors merged commit 755064b into rust-lang:beta Sep 18, 2020
@rustbot rustbot added this to the 1.47.0 milestone Sep 18, 2020
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants