Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[0.2] Small sync fixes and backports #4086

Merged
merged 9 commits into from
Nov 18, 2024
Merged

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 17, 2024

@rustbot
Copy link
Collaborator

rustbot commented Nov 17, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@tgross35 tgross35 enabled auto-merge November 17, 2024 07:54
@tgross35 tgross35 changed the title [0.2] Apply small fixes to sync main and libc-0.2 build and test [0.2] Small sync fixes and backports Nov 17, 2024
@tgross35 tgross35 force-pushed the misc-sync branch 3 times, most recently from c624793 to be0d8a1 Compare November 17, 2024 08:25
tgross35 and others added 5 commits November 17, 2024 03:26
Just check out a few hunks of these files from `main` now that we aren't
limited by the old MSRV.
Signed-off-by: shandongbinzhou <shandongbinzhou@outlook.com>
(cherry picked from commit 7735f68)
(backport <rust-lang#3734>)
(cherry picked from commit 7000471)
(backport <rust-lang#3746>)
(cherry picked from commit 68ebe1d)
close rust-lang#3611

(backport <rust-lang#3617>)
(cherry picked from commit 01955ae)
@rustbot rustbot added the O-musl label Nov 17, 2024
@tgross35 tgross35 force-pushed the misc-sync branch 2 times, most recently from 5c5007f to face160 Compare November 17, 2024 08:42
close rust-lang#3190

(backport <rust-lang#3213>)
(cherry picked from commit e3caaf6)
tgross35 and others added 2 commits November 17, 2024 04:04
Also make shellcheck failures actually cause an exit, `find ... -exec`
apparently does not propagate errors.

(backport <rust-lang#4087>)
(cherry picked from commit 1568789)
(backport <rust-lang#3647>)
(cherry picked from commit 2e94ad3)
@tgross35 tgross35 added this pull request to the merge queue Nov 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 17, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 18, 2024
Merged via the queue into rust-lang:libc-0.2 with commit 1c913e7 Nov 18, 2024
44 checks passed
@tgross35 tgross35 deleted the misc-sync branch November 18, 2024 04:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants