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

Jump to bottom

Workaround #109797 on windows-gnu #109806

Merged
merged 1 commit into from
Apr 7, 2023
Merged

Workaround #109797 on windows-gnu #109806

merged 1 commit into from
Apr 7, 2023

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Mar 31, 2023

The addition of #[inline] here in #108089 caused an unrelated linking issue (#109797). This PR removes this attribute again on Windows to avoid regressions.

@rustbot
Copy link
Collaborator

rustbot commented Mar 31, 2023

r? @m-ou-se

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 31, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 31, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@ChrisDenton
Copy link
Member

If it's just Windows gnu that's the issue then couldn't it still be applied on Windows msvc?

@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 31, 2023

MSVC doesn't use this file as it supports #[thread_local].

@pnkfelix
Copy link
Member

pnkfelix commented Apr 6, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Apr 6, 2023

📌 Commit 6c94136 has been approved by pnkfelix

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 Apr 6, 2023
@pnkfelix pnkfelix mentioned this pull request Apr 6, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 6, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2023
@bors
Auto merge of rust-lang#110024 - matthiaskrgr:rollup-mydkufd, r=matth…
c934ce9 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#109806 (Workaround rust-lang#109797 on windows-gnu)
 - rust-lang#109957 (diagnostics: account for self type when looking for source of unsolved type variable)
 - rust-lang#109960 (Fix buffer overrun in bootstrap and (test-only) symlink_junction)
 - rust-lang#110013 (Label `non_exhaustive` attribute on privacy errors from non-local items)
 - rust-lang#110016 (Run collapsed GUI test in mobile mode as well)
 - rust-lang#110022 (fix: fix regression in rust-lang#109203)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b7e6973 into rust-lang:master Apr 7, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 7, 2023
@Zoxc Zoxc deleted the gnu-tls branch April 7, 2023 08:40
@ehuss ehuss mentioned this pull request Jul 18, 2024
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@m-ou-se m-ou-se

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Zoxc @rustbot @ChrisDenton @pnkfelix @bors @m-ou-se