Skip to content

Sync upstream #353

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

Merged
merged 28 commits into from
Jul 7, 2023
Merged

Sync upstream #353

merged 28 commits into from
Jul 7, 2023

Conversation

calebzulawski
Copy link
Member

Reverse sync from rust-lang/rust

workingjubilee and others added 26 commits December 2, 2021 18:27
…jubilee

Sync portable-simd for bitmasks &c.

In the ideal case, where everything works easily and nothing has to be rearranged, it is as simple as:
- `git subtree pull -P library/portable-simd https://github.com/rust-lang/portable-simd - ${branch}`
- write the commit message
- `python x.py test --stage 1` to make sure it runs
- `git push` to your PR-to-rustc branch

If anything borks up this flow, you can fix it with sufficient git wizardry but you are usually better off going back to the source, fixing it, and starting over, before you open the PR.

r? `@calebzulawski`
This updates the standard library's documentation to use the new syntax. The
documentation is worthwhile to update as it should be more idiomatic
(particularly for features like this, which are nice for users to get acquainted
with). The general codebase is likely more hassle than benefit to update: it'll
hurt git blame, and generally updates can be done by folks updating the code if
(and when) that makes things more readable with the new format.

A few places in the compiler and library code are updated (mostly just due to
already having been done when this commit was first authored).
It looks like the last time had left some remaining cfg's -- which made me think
that the stage0 bump was actually successful. This brings us to a released 1.62
beta though.
This PR will fix some typos detected by [typos].

I only picked the ones I was sure were spelling errors to fix, mostly in
the comments.

[typos]: https://github.com/crate-ci/typos
These were likely from before the `PartialEq<str>` impl for `&String`.
rust-lang/cargo#10910 starts emitting warning if resolver is not set
for 2021 edition package. We want to surpress the warning for now.
@calebzulawski
Copy link
Member Author

@workingjubilee have you ever done this reverse sync?

@calebzulawski
Copy link
Member Author

I added a message whenever a PR is opened against our code in rust-lang/rust, hopefully some of these smaller changes will happen here in the future.

@workingjubilee
Copy link
Member

I have, which was why I hadn't opened this PR yet. I was planning to investigate why the reverse sync brought in old changes that should have already been synced, and if it would be prevented in the future.

@calebzulawski
Copy link
Member Author

Ok, up to you if I abandon this, I'm guessing it has something to do with commit order. I wanted to give it a try so I know how to do it in the future.

@workingjubilee
Copy link
Member

I'm quite appreciative that you did it, tbh! I will try to figure out swiftly if there is something amiss with the subtree sync that means we shouldn't land this. Probably not, we probably should, just would be nice to remove all doubt.

@workingjubilee
Copy link
Member

I finally ran the multi-iteration shell-game to confirm this will work, sorry for the delay!

@workingjubilee workingjubilee merged commit 2b55e03 into master Jul 7, 2023
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.