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.

Sign up for GitHub

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

Jump to bottom

[beta] backport rollup #106162

Merged
merged 6 commits into from
Dec 27, 2022
Merged

[beta] backport rollup #106162

merged 6 commits into from
Dec 27, 2022

Conversation

Mark-Simulacrum
Copy link
Member

r? @ghost

andrewpollack and others added 6 commits December 26, 2022 17:28
@andrewpollack @Mark-Simulacrum
Revert "Replace usage of ResumeTy in async lowering with Context"
ff4ca95
@lqd @Mark-Simulacrum
don't copy symbols from dylibs with -Zdylib-lto
0645c3d
@lqd @Mark-Simulacrum
add simulated non-regression test for issue 105637
95887f2
@GuillaumeGomez @Mark-Simulacrum
Don't take into account hashtag prepended lines if not in rust code b…
4b988c9 
…lock
@GuillaumeGomez @Mark-Simulacrum
Add test for non-rust code block hashtag prepended lines
d4bafb6
@sunfishcode @Mark-Simulacrum
Mangle "main" as "__main_void" on wasm32-wasi
dbc1048 
On wasm, the age-old C trick of having a main function which can either have
no arguments or argc+argv doesn't work, because wasm requires caller and
callee signatures to match. WASI's current strategy is to have compilers
mangle main's name to indicate which signature they're using. Rust uses the
no-argument form, which should be mangled as `__main_void`.

This is needed on wasm32-wasi as of rust-lang#105395.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Dec 26, 2022
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Dec 26, 2022

📌 Commit dbc1048 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 26, 2022
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
  CACHE_DOMAIN: ci-caches.rust-lang.org
  CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
  IMAGE: x86_64-gnu-tools
##[endgroup]
fatal: unknown commit 53fd98ca776cb875bc9e5514f56b52eb74f9e7a9
All commits in `HEAD` are present in `master`
src/ci/scripts/verify-stable-version-number.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
env:
  CI_JOB_NAME: x86_64-gnu-tools
---
.......... (90/91)
.          (91/91)


/checkout/src/test/rustdoc-gui/code-sidebar-toggle.goml code-sidebar-toggle... FAILED
[ERROR] (line 4) Error: Execution context was destroyed, most likely because of a navigation.: for command `wait-for: "#sidebar-toggle"`
Build completed unsuccessfully in 0:02:22

@bors
Copy link
Contributor

bors commented Dec 27, 2022

⌛ Testing commit dbc1048 with merge b364405...

@bors
Copy link
Contributor

bors commented Dec 27, 2022

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing b364405 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 27, 2022
@bors bors merged commit b364405 into rust-lang:beta Dec 27, 2022
@rustbot rustbot added this to the 1.67.0 milestone Dec 27, 2022
@Mark-Simulacrum Mark-Simulacrum deleted the beta-next branch December 27, 2022 13:23
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
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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.
8 participants
@Mark-Simulacrum @bors @rust-log-analyzer @rustbot @andrewpollack @lqd @GuillaumeGomez @sunfishcode