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

docs: inline alloc::ffi::c_str types to alloc::ffi #134851

Merged
merged 1 commit into from
Dec 29, 2024

Conversation

lukas-code
Copy link
Member

like #134791 but for alloc

r? @tgross35 @notriddle

@lukas-code lukas-code added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 28, 2024
@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 Dec 28, 2024
@tgross35
Copy link
Contributor

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 29, 2024

📌 Commit 11ad6ff has been approved by tgross35

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 29, 2024
Zalathar added a commit to Zalathar/rust that referenced this pull request Dec 29, 2024
docs: inline `alloc::ffi::c_str` types to `alloc::ffi`

like rust-lang#134791 but for `alloc`

r? `@tgross35` `@notriddle`
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
Rollup of 5 pull requests

Successful merges:

 - rust-lang#134799 (nits: Cleanups in `librustdoc::clean`)
 - rust-lang#134851 (docs: inline `alloc::ffi::c_str` types to `alloc::ffi`)
 - rust-lang#134869 (Bump compiler cc)
 - rust-lang#134876 (bootstrap: Consolidate the macros for declaring compiletest test suites)
 - rust-lang#134883 (bootstrap: Fix `./x check bootstrap` by moving `shared_helpers::tests`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8f4bf86 into rust-lang:master Dec 29, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 29, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 29, 2024
Rollup merge of rust-lang#134851 - lukas-code:alloc-ffi, r=tgross35

docs: inline `alloc::ffi::c_str` types to `alloc::ffi`

like rust-lang#134791 but for `alloc`

r? ``@tgross35`` ``@notriddle``
@lukas-code lukas-code deleted the alloc-ffi branch December 29, 2024 15:22
@cuviper cuviper added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 2, 2025
@cuviper cuviper mentioned this pull request Jan 2, 2025
@cuviper cuviper modified the milestones: 1.85.0, 1.84.0 Jan 2, 2025
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 2, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2025
[beta] backports

- Do not call `extern_crate` on current trait on crate mismatch errors rust-lang#133585
- Correctly handle comments in attributes in doctests source code rust-lang#134260
- Correctly document CTFE behavior of is_null and methods that call is_null. rust-lang#134325
- Make sure we handle `backwards_incompatible_lint` drops appropriately in drop elaboration rust-lang#134486
- Bump compiler `cc` to 1.2.5 rust-lang#134505
- Handle `DropKind::ForLint` in coroutines correctly rust-lang#134575
- docs: inline `std::ffi::c_str` types to `std::ffi` rust-lang#134791
- docs: inline `alloc::ffi::c_str` types to `alloc::ffi` rust-lang#134851

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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
Development

Successfully merging this pull request may close these issues.

5 participants