diff options
| author | bors <bors@rust-lang.org> | 2024-08-12 22:17:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-12 22:17:05 +0000 |
| commit | db5704ffca0e4f7a55f49160c336d43be7c104e2 (patch) | |
| tree | e8a79424591200ed5fedbe653e8e93841fb20a38 /library/alloc | |
| parent | 91376f416222a238227c84a848d168835ede2cc3 (diff) | |
| parent | 522d43673a6998be3d494645c0e4e3ecb37baaa1 (diff) | |
| download | rust-db5704ffca0e4f7a55f49160c336d43be7c104e2.tar.gz rust-db5704ffca0e4f7a55f49160c336d43be7c104e2.zip | |
Auto merge of #129024 - matthiaskrgr:rollup-uj1pd0x, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #128712 (Normalize struct tail properly for `dyn` ptr-to-ptr casting in new solver) - #128912 (Store `do_not_recommend`-ness in impl header) - #129000 (bootstrap: clear miri ui-test deps when miri sysroot gets rebuilt) - #129013 (Remove unused script from run-make tests) - #129017 (Replace `std::fmt:FormatterFn` with `std::fmt::from_fn`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/fmt.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/alloc/src/fmt.rs b/library/alloc/src/fmt.rs index 4b9b90fc1f1..571fcd177aa 100644 --- a/library/alloc/src/fmt.rs +++ b/library/alloc/src/fmt.rs @@ -581,7 +581,7 @@ pub use core::fmt::Alignment; #[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::Error; #[unstable(feature = "debug_closure_helpers", issue = "117729")] -pub use core::fmt::FormatterFn; +pub use core::fmt::{from_fn, FromFn}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::fmt::{write, Arguments}; #[stable(feature = "rust1", since = "1.0.0")] |