Skip to content

Commit 3a087ad

Browse files
committed
Auto merge of #67670 - oli-obk:rollup-2dp08sd, r=oli-obk
Rollup of 15 pull requests Successful merges: - #65244 (add IntoFuture trait and support for await) - #67576 (reuse `capacity` variable in slice::repeat) - #67588 (Use NonNull in slice::Iter and slice::IterMut.) - #67594 (Update libc to 0.2.66) - #67602 (Use issue = "none" instead of "0" in intrinsics) - #67604 (Add Scalar::to_(u|i)16 methods) - #67617 (Remove `compiler_builtins_lib` documentation) - #67621 (Use the correct type for static qualifs) - #67629 (Remove redundant link texts) - #67632 (Convert collapsed to shortcut reference links) - #67633 (Update .mailmap) - #67635 (Document safety of Path casting) - #67654 (Add regression test for old NLL ICE) - #67659 (Stabilize the `matches!` macro) - #67664 (Fix some mailmap entries) Failed merges: r? @ghost
2 parents 74c4e6a + 65bbcf0 commit 3a087ad

File tree

46 files changed

+267
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+267
-174
lines changed

.mailmap

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ Chris C Cerami <chrisccerami@users.noreply.github.com> Chris C Cerami <chrisccer
5454
Chris Pressey <cpressey@gmail.com>
5555
Chris Thorn <chris@thorn.co> Chris Thorn <thorn@thoughtbot.com>
5656
Chris Vittal <christopher.vittal@gmail.com> Christopher Vittal <christopher.vittal@gmail.com>
57-
Christian Poveda <christianpoveda@protonmail.com> <cn.poveda.ruiz@gmail.com>
58-
Christian Poveda <christianpoveda@protonmail.com> <z1mvader@protonmail.com>
59-
Christian Poveda <christianpoveda@protonmail.com> <cpovedar@fnal.gov>
57+
Christian Poveda <git@christianpoveda.xyz> <christianpoveda@protonmail.com>
58+
Christian Poveda <git@christianpoveda.xyz> <cn.poveda.ruiz@gmail.com>
59+
Christian Poveda <git@christianpoveda.xyz> <z1mvader@protonmail.com>
60+
Christian Poveda <git@christianpoveda.xyz> <cpovedar@fnal.gov>
6061
Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
6162
Clinton Ryan <clint.ryan3@gmail.com>
6263
Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
@@ -154,6 +155,7 @@ Lindsey Kuper <lindsey@composition.al> <lkuper@mozilla.com>
154155
Luke Metz <luke.metz@students.olin.edu>
155156
Luqman Aden <me@luqman.ca> <laden@csclub.uwaterloo.ca>
156157
Luqman Aden <me@luqman.ca> <laden@mozilla.com>
158+
Manish Goregaokar <manishsmail@gmail.com>
157159
Marcell Pardavi <marcell.pardavi@gmail.com>
158160
Margaret Meyerhofer <mmeyerho@andrew.cmu.edu> <mmeyerho@andrew>
159161
Mark Rousskov <mark.simulacrum@gmail.com>
@@ -185,6 +187,7 @@ Neil Pankey <npankey@gmail.com> <neil@wire.im>
185187
Nick Platt <platt.nicholas@gmail.com>
186188
Nicole Mazzuca <npmazzuca@gmail.com>
187189
Nif Ward <nif.ward@gmail.com>
190+
Nika Layzell <michael@thelayzells.com>
188191
Oliver Middleton <olliemail27@gmail.com> <ollie27@users.noreply.github.com>
189192
Oliver Scherer <oliver.schneider@kit.edu> <git-spam-no-reply9815368754983@oli-obk.de>
190193
Oliver Scherer <oliver.schneider@kit.edu> <git-spam9815368754983@oli-obk.de>
@@ -204,7 +207,6 @@ Paul Faria <paul_faria@ultimatesoftware.com> Paul Faria <Nashenas88@gmail.com>
204207
Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
205208
Peter Elmers <peter.elmers@yahoo.com> <peter.elmers@rice.edu>
206209
Peter Liniker <peter.liniker+github@gmail.com>
207-
Peter Zotov <whitequark@whitequark.org>
208210
Phil Dawes <phil@phildawes.net> Phil Dawes <pdawes@drw.com>
209211
Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
210212
Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
@@ -255,6 +257,7 @@ Ulrik Sverdrup <bluss@users.noreply.github.com> Ulrik Sverdrup <root@localhost>
255257
Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
256258
Vadim Petrochenkov <vadim.petrochenkov@gmail.com> petrochenkov <vadim.petrochenkov@gmail.com>
257259
Vitali Haravy <HumaneProgrammer@gmail.com> Vitali Haravy <humaneprogrammer@gmail.com>
260+
whitequark <whitequark@whitequark.org>
258261
William Ting <io@williamting.com> <william.h.ting@gmail.com>
259262
Xuefeng Wu <benewu@gmail.com> Xuefeng Wu <xfwu@thoughtworks.com>
260263
Xuefeng Wu <benewu@gmail.com> XuefengWu <benewu@gmail.com>

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ labels to triage issues:
367367
to fix the issue.
368368

369369
* The dark blue **final-comment-period** label marks bugs that are using the
370-
RFC signoff functionality of [rfcbot][rfcbot] and are currently in the final
370+
RFC signoff functionality of [rfcbot] and are currently in the final
371371
comment period.
372372

373373
* Red, **I**-prefixed labels indicate the **importance** of the issue. The
@@ -385,7 +385,7 @@ labels to triage issues:
385385
label.
386386

387387
* The gray **proposed-final-comment-period** label marks bugs that are using
388-
the RFC signoff functionality of [rfcbot][rfcbot] and are currently awaiting
388+
the RFC signoff functionality of [rfcbot] and are currently awaiting
389389
signoff of all team members in order to enter the final comment period.
390390

391391
* Pink, **regression**-prefixed labels track regressions from stable to the

Cargo.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1773,9 +1773,9 @@ checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
17731773

17741774
[[package]]
17751775
name = "libc"
1776-
version = "0.2.64"
1776+
version = "0.2.66"
17771777
source = "registry+https://github.com/rust-lang/crates.io-index"
1778-
checksum = "74dfca3d9957906e8d1e6a0b641dc9a59848e793f1da2165889fd4f62d10d79c"
1778+
checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
17791779
dependencies = [
17801780
"rustc-std-workspace-core",
17811781
]

RELEASES.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4951,10 +4951,10 @@ Stabilized APIs
49514951
---------------
49524952

49534953
* [`std::panic`]
4954-
* [`std::panic::catch_unwind`][] (renamed from `recover`)
4955-
* [`std::panic::resume_unwind`][] (renamed from `propagate`)
4956-
* [`std::panic::AssertUnwindSafe`][] (renamed from `AssertRecoverSafe`)
4957-
* [`std::panic::UnwindSafe`][] (renamed from `RecoverSafe`)
4954+
* [`std::panic::catch_unwind`] (renamed from `recover`)
4955+
* [`std::panic::resume_unwind`] (renamed from `propagate`)
4956+
* [`std::panic::AssertUnwindSafe`] (renamed from `AssertRecoverSafe`)
4957+
* [`std::panic::UnwindSafe`] (renamed from `RecoverSafe`)
49584958
* [`str::is_char_boundary`]
49594959
* [`<*const T>::as_ref`]
49604960
* [`<*mut T>::as_ref`]
@@ -5234,18 +5234,18 @@ Libraries
52345234
---------
52355235

52365236
* Stabilized APIs:
5237-
* [`str::encode_utf16`][] (renamed from `utf16_units`)
5238-
* [`str::EncodeUtf16`][] (renamed from `Utf16Units`)
5237+
* [`str::encode_utf16`] (renamed from `utf16_units`)
5238+
* [`str::EncodeUtf16`] (renamed from `Utf16Units`)
52395239
* [`Ref::map`]
52405240
* [`RefMut::map`]
52415241
* [`ptr::drop_in_place`]
52425242
* [`time::Instant`]
52435243
* [`time::SystemTime`]
52445244
* [`Instant::now`]
5245-
* [`Instant::duration_since`][] (renamed from `duration_from_earlier`)
5245+
* [`Instant::duration_since`] (renamed from `duration_from_earlier`)
52465246
* [`Instant::elapsed`]
52475247
* [`SystemTime::now`]
5248-
* [`SystemTime::duration_since`][] (renamed from `duration_from_earlier`)
5248+
* [`SystemTime::duration_since`] (renamed from `duration_from_earlier`)
52495249
* [`SystemTime::elapsed`]
52505250
* Various `Add`/`Sub` impls for `Time` and `SystemTime`
52515251
* [`SystemTimeError`]
@@ -5432,8 +5432,8 @@ Libraries
54325432

54335433
* Stabilized APIs
54345434
* `Path`
5435-
* [`Path::strip_prefix`][] (renamed from relative_from)
5436-
* [`path::StripPrefixError`][] (new error type returned from strip_prefix)
5435+
* [`Path::strip_prefix`] (renamed from relative_from)
5436+
* [`path::StripPrefixError`] (new error type returned from strip_prefix)
54375437
* `Ipv4Addr`
54385438
* [`Ipv4Addr::is_loopback`]
54395439
* [`Ipv4Addr::is_private`]
@@ -5646,7 +5646,7 @@ Libraries
56465646

56475647
* Stabilized APIs:
56485648
[`Read::read_exact`],
5649-
[`ErrorKind::UnexpectedEof`][] (renamed from `UnexpectedEOF`),
5649+
[`ErrorKind::UnexpectedEof`] (renamed from `UnexpectedEOF`),
56505650
[`fs::DirBuilder`], [`fs::DirBuilder::new`],
56515651
[`fs::DirBuilder::recursive`], [`fs::DirBuilder::create`],
56525652
[`os::unix::fs::DirBuilderExt`],
@@ -5659,11 +5659,11 @@ Libraries
56595659
[`collections::hash_set::HashSet::drain`],
56605660
[`collections::binary_heap::Drain`],
56615661
[`collections::binary_heap::BinaryHeap::drain`],
5662-
[`Vec::extend_from_slice`][] (renamed from `push_all`),
5662+
[`Vec::extend_from_slice`] (renamed from `push_all`),
56635663
[`Mutex::get_mut`], [`Mutex::into_inner`], [`RwLock::get_mut`],
56645664
[`RwLock::into_inner`],
5665-
[`Iterator::min_by_key`][] (renamed from `min_by`),
5666-
[`Iterator::max_by_key`][] (renamed from `max_by`).
5665+
[`Iterator::min_by_key`] (renamed from `min_by`),
5666+
[`Iterator::max_by_key`] (renamed from `max_by`).
56675667
* The [core library][1.6co] is stable, as are most of its APIs.
56685668
* [The `assert_eq!` macro supports arguments that don't implement
56695669
`Sized`][1.6ae], such as arrays. In this way it behaves more like

src/doc/unstable-book/src/language-features/lang-items.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,7 @@ pub extern fn rust_begin_panic(info: &PanicInfo) -> ! {
188188

189189
In many cases, you may need to manually link to the `compiler_builtins` crate
190190
when building a `no_std` binary. You may observe this via linker error messages
191-
such as "```undefined reference to `__rust_probestack'```". Using this crate
192-
also requires enabling the library feature `compiler_builtins_lib`. You can read
193-
more about this [here][compiler-builtins-lib].
194-
195-
[compiler-builtins-lib]: ../library-features/compiler-builtins-lib.md
191+
such as "```undefined reference to `__rust_probestack'```".
196192

197193
## More about the language items
198194

src/doc/unstable-book/src/library-features/compiler-builtins-lib.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/liballoc/collections/binary_heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1094,7 +1094,7 @@ impl<T> FusedIterator for Iter<'_, T> {}
10941094

10951095
/// An owning iterator over the elements of a `BinaryHeap`.
10961096
///
1097-
/// This `struct` is created by the [`into_iter`] method on [`BinaryHeap`][`BinaryHeap`]
1097+
/// This `struct` is created by the [`into_iter`] method on [`BinaryHeap`]
10981098
/// (provided by the `IntoIterator` trait). See its documentation for more.
10991099
///
11001100
/// [`into_iter`]: struct.BinaryHeap.html#method.into_iter

src/liballoc/collections/btree/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ pub struct IterMut<'a, K: 'a, V: 'a> {
283283

284284
/// An owning iterator over the entries of a `BTreeMap`.
285285
///
286-
/// This `struct` is created by the [`into_iter`] method on [`BTreeMap`][`BTreeMap`]
286+
/// This `struct` is created by the [`into_iter`] method on [`BTreeMap`]
287287
/// (provided by the `IntoIterator` trait). See its documentation for more.
288288
///
289289
/// [`into_iter`]: struct.BTreeMap.html#method.into_iter

src/liballoc/collections/btree/set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl<T: fmt::Debug> fmt::Debug for Iter<'_, T> {
8383

8484
/// An owning iterator over the items of a `BTreeSet`.
8585
///
86-
/// This `struct` is created by the [`into_iter`] method on [`BTreeSet`][`BTreeSet`]
86+
/// This `struct` is created by the [`into_iter`] method on [`BTreeSet`]
8787
/// (provided by the `IntoIterator` trait). See its documentation for more.
8888
///
8989
/// [`BTreeSet`]: struct.BTreeSet.html

src/liballoc/collections/linked_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl<T: fmt::Debug> fmt::Debug for IterMut<'_, T> {
105105

106106
/// An owning iterator over the elements of a `LinkedList`.
107107
///
108-
/// This `struct` is created by the [`into_iter`] method on [`LinkedList`][`LinkedList`]
108+
/// This `struct` is created by the [`into_iter`] method on [`LinkedList`]
109109
/// (provided by the `IntoIterator` trait). See its documentation for more.
110110
///
111111
/// [`into_iter`]: struct.LinkedList.html#method.into_iter

0 commit comments

Comments
 (0)