Skip to content

Commit 5771449

Browse files
borsgitbot
authored and
gitbot
committed
Auto merge of rust-lang#136613 - workingjubilee:rollup-ry6rw0m, r=workingjubilee
Rollup of 13 pull requests Successful merges: - rust-lang#133932 (Avoid using make_direct_deprecated() in extern "ptx-kernel") - rust-lang#136269 (Pass spans around new solver) - rust-lang#136550 (Fix `rustc_hidden_type_of_opaques` for RPITITs with no default body) - rust-lang#136558 (Document minimum supported host tooling on macOS) - rust-lang#136563 (Clean up `Trivial*Impls` macros) - rust-lang#136566 (Fix link in from_fn.rs) - rust-lang#136573 (Document why some "type mismatches" exist) - rust-lang#136583 (Only highlight unmatchable parameters at the definition site) - rust-lang#136587 (Update browser-ui-test version to `0.20.2`) - rust-lang#136590 (Implement RustcInternal for RawPtrKind) - rust-lang#136591 (Add `rustc_hir_pretty::expr_to_string` function) - rust-lang#136595 (Fix `unreachable_pub` lint for hermit target) - rust-lang#136611 (cg_llvm: Remove the `mod llvm_` hack, which should no longer be necessary) Failed merges: - rust-lang#136565 (compiler: Clean up weird `rustc_abi` reexports) r? `@ghost` `@rustbot` modify labels: rollup
2 parents fecb7bd + 5218d09 commit 5771449

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

core/src/iter/sources/from_fn.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::fmt;
22

33
/// Creates an iterator with the provided closure
4-
/// `F: FnMut() -> Option<T>` as its `[next](Iterator::next)` method.
4+
/// `F: FnMut() -> Option<T>` as its [`next`](Iterator::next) method.
55
///
66
/// The iterator will yield the `T`s returned from the closure.
77
///

panic_unwind/src/hermit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ use core::any::Any;
77

88
pub(crate) unsafe fn cleanup(_ptr: *mut u8) -> Box<dyn Any + Send> {
99
extern "C" {
10-
pub fn __rust_abort() -> !;
10+
fn __rust_abort() -> !;
1111
}
1212
__rust_abort();
1313
}
1414

1515
pub(crate) unsafe fn panic(_data: Box<dyn Any + Send>) -> u32 {
1616
extern "C" {
17-
pub fn __rust_abort() -> !;
17+
fn __rust_abort() -> !;
1818
}
1919
__rust_abort();
2020
}

0 commit comments

Comments
 (0)