Skip to content

Commit d7f9451

Browse files
committed
Auto merge of rust-lang#74518 - Manishearth:rollup-jfmnh1r, r=Manishearth
Rollup of 4 pull requests Successful merges: - rust-lang#74333 (Deny unsafe operations in unsafe functions in libstd/alloc.rs) - rust-lang#74356 (Remove combine function) - rust-lang#74419 (Add a thumbv4t-none-eabi target) - rust-lang#74485 (More intra-doc links, add explicit exception list to linkchecker) Failed merges: - rust-lang#74486 (Improve Read::read_exact documentation) r? @ghost
2 parents 4803680 + 1636961 commit d7f9451

File tree

13 files changed

+322
-379
lines changed

13 files changed

+322
-379
lines changed

src/liballoc/collections/btree/map.rs

+12-21
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ use UnderflowResult::*;
4747
/// any other key, as determined by the [`Ord`] trait, changes while it is in the map. This is
4848
/// normally only possible through [`Cell`], [`RefCell`], global state, I/O, or unsafe code.
4949
///
50-
/// [`Ord`]: ../../std/cmp/trait.Ord.html
51-
/// [`Cell`]: ../../std/cell/struct.Cell.html
52-
/// [`RefCell`]: ../../std/cell/struct.RefCell.html
50+
/// [`Ord`]: core::cmp::Ord
51+
/// [`Cell`]: core::cell::Cell
52+
/// [`RefCell`]: core::cell::RefCell
5353
///
5454
/// # Examples
5555
///
@@ -256,8 +256,7 @@ where
256256
/// This `struct` is created by the [`iter`] method on [`BTreeMap`]. See its
257257
/// documentation for more.
258258
///
259-
/// [`iter`]: struct.BTreeMap.html#method.iter
260-
/// [`BTreeMap`]: struct.BTreeMap.html
259+
/// [`iter`]: BTreeMap::iter
261260
#[stable(feature = "rust1", since = "1.0.0")]
262261
pub struct Iter<'a, K: 'a, V: 'a> {
263262
range: Range<'a, K, V>,
@@ -276,8 +275,7 @@ impl<K: fmt::Debug, V: fmt::Debug> fmt::Debug for Iter<'_, K, V> {
276275
/// This `struct` is created by the [`iter_mut`] method on [`BTreeMap`]. See its
277276
/// documentation for more.
278277
///
279-
/// [`iter_mut`]: struct.BTreeMap.html#method.iter_mut
280-
/// [`BTreeMap`]: struct.BTreeMap.html
278+
/// [`iter_mut`]: BTreeMap::iter_mut
281279
#[stable(feature = "rust1", since = "1.0.0")]
282280
#[derive(Debug)]
283281
pub struct IterMut<'a, K: 'a, V: 'a> {
@@ -290,8 +288,7 @@ pub struct IterMut<'a, K: 'a, V: 'a> {
290288
/// This `struct` is created by the [`into_iter`] method on [`BTreeMap`]
291289
/// (provided by the `IntoIterator` trait). See its documentation for more.
292290
///
293-
/// [`into_iter`]: struct.BTreeMap.html#method.into_iter
294-
/// [`BTreeMap`]: struct.BTreeMap.html
291+
/// [`into_iter`]: IntoIterator::into_iter
295292
#[stable(feature = "rust1", since = "1.0.0")]
296293
pub struct IntoIter<K, V> {
297294
front: Option<Handle<NodeRef<marker::Owned, K, V, marker::Leaf>, marker::Edge>>,
@@ -315,8 +312,7 @@ impl<K: fmt::Debug, V: fmt::Debug> fmt::Debug for IntoIter<K, V> {
315312
/// This `struct` is created by the [`keys`] method on [`BTreeMap`]. See its
316313
/// documentation for more.
317314
///
318-
/// [`keys`]: struct.BTreeMap.html#method.keys
319-
/// [`BTreeMap`]: struct.BTreeMap.html
315+
/// [`keys`]: BTreeMap::keys
320316
#[stable(feature = "rust1", since = "1.0.0")]
321317
pub struct Keys<'a, K: 'a, V: 'a> {
322318
inner: Iter<'a, K, V>,
@@ -334,8 +330,7 @@ impl<K: fmt::Debug, V> fmt::Debug for Keys<'_, K, V> {
334330
/// This `struct` is created by the [`values`] method on [`BTreeMap`]. See its
335331
/// documentation for more.
336332
///
337-
/// [`values`]: struct.BTreeMap.html#method.values
338-
/// [`BTreeMap`]: struct.BTreeMap.html
333+
/// [`values`]: BTreeMap::values
339334
#[stable(feature = "rust1", since = "1.0.0")]
340335
pub struct Values<'a, K: 'a, V: 'a> {
341336
inner: Iter<'a, K, V>,
@@ -353,8 +348,7 @@ impl<K, V: fmt::Debug> fmt::Debug for Values<'_, K, V> {
353348
/// This `struct` is created by the [`values_mut`] method on [`BTreeMap`]. See its
354349
/// documentation for more.
355350
///
356-
/// [`values_mut`]: struct.BTreeMap.html#method.values_mut
357-
/// [`BTreeMap`]: struct.BTreeMap.html
351+
/// [`values_mut`]: BTreeMap::values_mut
358352
#[stable(feature = "map_values_mut", since = "1.10.0")]
359353
#[derive(Debug)]
360354
pub struct ValuesMut<'a, K: 'a, V: 'a> {
@@ -366,8 +360,7 @@ pub struct ValuesMut<'a, K: 'a, V: 'a> {
366360
/// This `struct` is created by the [`range`] method on [`BTreeMap`]. See its
367361
/// documentation for more.
368362
///
369-
/// [`range`]: struct.BTreeMap.html#method.range
370-
/// [`BTreeMap`]: struct.BTreeMap.html
363+
/// [`range`]: BTreeMap::range
371364
#[stable(feature = "btree_range", since = "1.17.0")]
372365
pub struct Range<'a, K: 'a, V: 'a> {
373366
front: Option<Handle<NodeRef<marker::Immut<'a>, K, V, marker::Leaf>, marker::Edge>>,
@@ -386,8 +379,7 @@ impl<K: fmt::Debug, V: fmt::Debug> fmt::Debug for Range<'_, K, V> {
386379
/// This `struct` is created by the [`range_mut`] method on [`BTreeMap`]. See its
387380
/// documentation for more.
388381
///
389-
/// [`range_mut`]: struct.BTreeMap.html#method.range_mut
390-
/// [`BTreeMap`]: struct.BTreeMap.html
382+
/// [`range_mut`]: BTreeMap::range_mut
391383
#[stable(feature = "btree_range", since = "1.17.0")]
392384
pub struct RangeMut<'a, K: 'a, V: 'a> {
393385
front: Option<Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge>>,
@@ -412,8 +404,7 @@ impl<K: fmt::Debug, V: fmt::Debug> fmt::Debug for RangeMut<'_, K, V> {
412404
///
413405
/// This `enum` is constructed from the [`entry`] method on [`BTreeMap`].
414406
///
415-
/// [`BTreeMap`]: struct.BTreeMap.html
416-
/// [`entry`]: struct.BTreeMap.html#method.entry
407+
/// [`entry`]: BTreeMap::entry
417408
#[stable(feature = "rust1", since = "1.0.0")]
418409
pub enum Entry<'a, K: 'a, V: 'a> {
419410
/// A vacant entry.

src/liballoc/collections/btree/set.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ use super::Recover;
2222
/// to any other item, as determined by the [`Ord`] trait, changes while it is in the set. This is
2323
/// normally only possible through [`Cell`], [`RefCell`], global state, I/O, or unsafe code.
2424
///
25-
/// [`Ord`]: ../../std/cmp/trait.Ord.html
26-
/// [`Cell`]: ../../std/cell/struct.Cell.html
27-
/// [`RefCell`]: ../../std/cell/struct.RefCell.html
25+
/// [`Ord`]: core::cmp::Ord
26+
/// [`Cell`]: core::cell::Cell
27+
/// [`RefCell`]: core::cell::RefCell
2828
///
2929
/// # Examples
3030
///

src/liballoc/str.rs

+3-14
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ impl str {
240240
/// While doing so, it attempts to find matches of a pattern. If it finds any, it
241241
/// replaces them with the replacement string slice.
242242
///
243-
/// [`String`]: string/struct.String.html
244-
///
245243
/// # Examples
246244
///
247245
/// Basic usage:
@@ -280,8 +278,6 @@ impl str {
280278
/// While doing so, it attempts to find matches of a pattern. If it finds any, it
281279
/// replaces them with the replacement string slice at most `count` times.
282280
///
283-
/// [`String`]: string/struct.String.html
284-
///
285281
/// # Examples
286282
///
287283
/// Basic usage:
@@ -324,8 +320,6 @@ impl str {
324320
/// the case, this function returns a [`String`] instead of modifying the
325321
/// parameter in-place.
326322
///
327-
/// [`String`]: string/struct.String.html
328-
///
329323
/// # Examples
330324
///
331325
/// Basic usage:
@@ -411,8 +405,6 @@ impl str {
411405
/// the case, this function returns a [`String`] instead of modifying the
412406
/// parameter in-place.
413407
///
414-
/// [`String`]: string/struct.String.html
415-
///
416408
/// # Examples
417409
///
418410
/// Basic usage:
@@ -459,8 +451,7 @@ impl str {
459451

460452
/// Converts a [`Box<str>`] into a [`String`] without copying or allocating.
461453
///
462-
/// [`String`]: string/struct.String.html
463-
/// [`Box<str>`]: boxed/struct.Box.html
454+
/// [`Box<str>`]: Box
464455
///
465456
/// # Examples
466457
///
@@ -485,8 +476,6 @@ impl str {
485476
///
486477
/// This function will panic if the capacity would overflow.
487478
///
488-
/// [`String`]: string/struct.String.html
489-
///
490479
/// # Examples
491480
///
492481
/// Basic usage:
@@ -525,7 +514,7 @@ impl str {
525514
/// assert_eq!("GRüßE, JüRGEN ❤", s.to_ascii_uppercase());
526515
/// ```
527516
///
528-
/// [`make_ascii_uppercase`]: #method.make_ascii_uppercase
517+
/// [`make_ascii_uppercase`]: str::make_ascii_uppercase
529518
/// [`to_uppercase`]: #method.to_uppercase
530519
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
531520
#[inline]
@@ -555,7 +544,7 @@ impl str {
555544
/// assert_eq!("grüße, jürgen ❤", s.to_ascii_lowercase());
556545
/// ```
557546
///
558-
/// [`make_ascii_lowercase`]: #method.make_ascii_lowercase
547+
/// [`make_ascii_lowercase`]: str::make_ascii_lowercase
559548
/// [`to_lowercase`]: #method.to_lowercase
560549
#[stable(feature = "ascii_methods_on_intrinsics", since = "1.23.0")]
561550
#[inline]

0 commit comments

Comments
 (0)