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

Rollup of 10 pull requests #120461

Closed
wants to merge 28 commits into from
Closed

Conversation

fmease
Copy link
Member

@fmease fmease commented Jan 29, 2024

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joshlf and others added 28 commits October 12, 2023 15:35
General improvements, and also aims to better encourage the reader
to actually check out Arc::try_unwrap.
For consistency with normal functions.
It has 1-to-1 correspondence to its expression id.

Also remove mostly useless `visit_let_expr`.
This reverts commit 31ecf34.

Co-authored-by: Ryan Levick <[email protected]>
Reject infinitely-sized reads from io::Repeat

These calls would always run out of memory.

Related to rust-lang#117925
…ark-Simulacrum

Improve documentation for [A]Rc::into_inner

General improvements, and also aims to better encourage the reader to actually check out Arc::try_unwrap.

This addresses concerns from rust-lang#106894 (comment).

Rendered:

![Screenshot_20240123_114436](https://github.com/rust-lang/rust/assets/3986214/68896d62-13e0-4f3a-8073-91d8e77c5554)
![Screenshot_20240123_114455](https://github.com/rust-lang/rust/assets/3986214/dc58e4bd-dd7f-40b1-bc50-fd6200dde593)
Update codegen test for LLVM 18

r? ``````@cuviper``````
…tree, r=cjgillot

Make the coroutine def id of an async closure the child of the closure def id

Adjust def collection to make the (inner) coroutine returned by an async closure be a def id child of the (outer) closure. This makes it easy to map from coroutine -> closure by using `tcx.parent`, since currently it's not trivial to do this.
raw pointer metadata API: data address -> data pointer

A pointer consists of [more than just an address](rust-lang/rfcs#3559), so let's not equate "pointer" and "address" in these docs.
…Nilstrieb

Remove unnecessary unit returns in query declarations

For consistency with normal functions.
…errors

hir: Two preparatory changes for rust-lang#120206

cc rust-lang#120206
r? ``@compiler-errors``
Revert outdated version of "Add the wasm32-wasi-preview2 target"

An outdated version of rust-lang#119616 was merged in rollup rust-lang#120309.
This reverts those changes to enable rust-lang#119616 to “retain the intended diff” after a rebase.
``@rylev`` has agreed that this would be the cleanest approach with respect to the history.
Unblocks rust-lang#119616.

r? ``@petrochenkov`` or compiler or libs
…ement, r=fmease

Fixes footnote handling in rustdoc

Fixes rust-lang#100638.

You can now declare footnotes like this:

```rust
//! Reference to footnotes A[^1], B[^2] and C[^3].
//!
//! [^1]: Footnote A.
//! [^2]: Footnote B.
//! [^3]: Footnote C.
```

r? ``@notriddle``
@rustbot rustbot added O-wasi Operating system: Wasi, Webassembly System Interface S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 29, 2024
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. rollup A PR which is a rollup labels Jan 29, 2024
@fmease
Copy link
Member Author

fmease commented Jan 29, 2024

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Jan 29, 2024

📌 Commit 83b3958 has been approved by fmease

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 Jan 29, 2024
@bors
Copy link
Contributor

bors commented Jan 29, 2024

⌛ Testing commit 83b3958 with merge 9b7e09b...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 29, 2024
Rollup of 10 pull requests

Successful merges:

 - rust-lang#116677 (References refer to allocated objects)
 - rust-lang#119991 (Reject infinitely-sized reads from io::Repeat)
 - rust-lang#120266 (Improve documentation for [A]Rc::into_inner)
 - rust-lang#120376 (Update codegen test for LLVM 18)
 - rust-lang#120402 (Make the coroutine def id of an async closure the child of the closure def id)
 - rust-lang#120424 (raw pointer metadata API: data address -> data pointer)
 - rust-lang#120425 (Remove unnecessary unit returns in query declarations)
 - rust-lang#120428 (hir: Two preparatory changes for rust-lang#120206)
 - rust-lang#120434 (Revert outdated version of "Add the wasm32-wasi-preview2 target")
 - rust-lang#120443 (Fixes footnote handling in rustdoc)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job test-various failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [mir-opt] tests/mir-opt/inline/polymorphic_recursion.rs ... ok

failures:

---- [mir-opt] tests/mir-opt/pre-codegen/slice_index.rs stdout ----
42                                 debug self => _8;
43                             }
44                             scope 15 (inlined std::ptr::from_raw_parts_mut::<[u32]>) {
-                                 debug data_address => _9;
+                                 debug data_pointer => _9;
46                                 debug metadata => _6;
47                                 let mut _10: *const ();
48                                 let mut _11: std::ptr::metadata::PtrComponents<[u32]>;
90         StorageLive(_11);
91         StorageLive(_10);
91         StorageLive(_10);
92         _10 = _9 as *const () (PointerCoercion(MutToConstPointer));
-         _11 = std::ptr::metadata::PtrComponents::<[u32]> { data_address: move _10, metadata: _6 };
+         _11 = std::ptr::metadata::PtrComponents::<[u32]> { data_pointer: move _10, metadata: _6 };
94         StorageDead(_10);
95         _12 = std::ptr::metadata::PtrRepr::<[u32]> { const_ptr: move _11 };
96         StorageDead(_11);
thread '[mir-opt] tests/mir-opt/pre-codegen/slice_index.rs' panicked at src/tools/compiletest/src/runtest.rs:4130:21:
thread '[mir-opt] tests/mir-opt/pre-codegen/slice_index.rs' panicked at src/tools/compiletest/src/runtest.rs:4130:21:
Actual MIR output differs from expected MIR output /checkout/tests/mir-opt/pre-codegen/slice_index.slice_get_unchecked_mut_range.PreCodegen.after.panic-unwind.mir


failures:
    [mir-opt] tests/mir-opt/pre-codegen/slice_index.rs

@bors
Copy link
Contributor

bors commented Jan 29, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 29, 2024
@fmease fmease closed this Jan 29, 2024
@fmease fmease deleted the rollup-30y3cyy branch January 29, 2024 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-wasi Operating system: Wasi, Webassembly System Interface rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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
Development

Successfully merging this pull request may close these issues.