Skip to content

Commit f56b46c

Browse files
authored
Rollup merge of #41066 - steveklabnik:fix-links, r=frewsxcv
Fix links part of #40912 []\n() is not actually a link. r? @frewsxcv @GuillaumeGomez
2 parents 1b6d25b + b5cedb7 commit f56b46c

File tree

3 files changed

+60
-40
lines changed

3 files changed

+60
-40
lines changed

Diff for: src/libcollections/linked_list.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,8 @@ impl<T> LinkedList<T> {
697697

698698
/// Returns a place for insertion at the front of the list.
699699
///
700-
/// Using this method with placement syntax is equivalent to [`push_front`]
701-
/// (#method.push_front), but may be more efficient.
700+
/// Using this method with placement syntax is equivalent to
701+
/// [`push_front`](#method.push_front), but may be more efficient.
702702
///
703703
/// # Examples
704704
///

Diff for: src/libcore/intrinsics.rs

+54-36
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,18 @@ extern "rust-intrinsic" {
6161
/// `std::sync::atomic` types via the `compare_exchange` method by passing
6262
/// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
6363
/// as both the `success` and `failure` parameters. For example,
64-
/// [`AtomicBool::compare_exchange`]
65-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
64+
/// [`AtomicBool::compare_exchange`][compare_exchange].
65+
///
66+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
6667
pub fn atomic_cxchg<T>(dst: *mut T, old: T, src: T) -> (T, bool);
6768
/// Stores a value if the current value is the same as the `old` value.
6869
/// The stabilized version of this intrinsic is available on the
6970
/// `std::sync::atomic` types via the `compare_exchange` method by passing
7071
/// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
7172
/// as both the `success` and `failure` parameters. For example,
72-
/// [`AtomicBool::compare_exchange`]
73-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
73+
/// [`AtomicBool::compare_exchange`][compare_exchange].
74+
///
75+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
7476
pub fn atomic_cxchg_acq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
7577
/// Stores a value if the current value is the same as the `old` value.
7678
/// The stabilized version of this intrinsic is available on the
@@ -79,8 +81,9 @@ extern "rust-intrinsic" {
7981
/// as the `success` and
8082
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
8183
/// as the `failure` parameters. For example,
82-
/// [`AtomicBool::compare_exchange`]
83-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
84+
/// [`AtomicBool::compare_exchange`][compare_exchange].
85+
///
86+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
8487
pub fn atomic_cxchg_rel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
8588
/// Stores a value if the current value is the same as the `old` value.
8689
/// The stabilized version of this intrinsic is available on the
@@ -89,16 +92,18 @@ extern "rust-intrinsic" {
8992
/// as the `success` and
9093
/// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
9194
/// as the `failure` parameters. For example,
92-
/// [`AtomicBool::compare_exchange`]
93-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
95+
/// [`AtomicBool::compare_exchange`][compare_exchange].
96+
///
97+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
9498
pub fn atomic_cxchg_acqrel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
9599
/// Stores a value if the current value is the same as the `old` value.
96100
/// The stabilized version of this intrinsic is available on the
97101
/// `std::sync::atomic` types via the `compare_exchange` method by passing
98102
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
99103
/// as both the `success` and `failure` parameters. For example,
100-
/// [`AtomicBool::compare_exchange`]
101-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
104+
/// [`AtomicBool::compare_exchange`][compare_exchange].
105+
///
106+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
102107
pub fn atomic_cxchg_relaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
103108
/// Stores a value if the current value is the same as the `old` value.
104109
/// The stabilized version of this intrinsic is available on the
@@ -107,8 +112,9 @@ extern "rust-intrinsic" {
107112
/// as the `success` and
108113
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
109114
/// as the `failure` parameters. For example,
110-
/// [`AtomicBool::compare_exchange`]
111-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
115+
/// [`AtomicBool::compare_exchange`][compare_exchange].
116+
///
117+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
112118
pub fn atomic_cxchg_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
113119
/// Stores a value if the current value is the same as the `old` value.
114120
/// The stabilized version of this intrinsic is available on the
@@ -117,8 +123,9 @@ extern "rust-intrinsic" {
117123
/// as the `success` and
118124
/// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
119125
/// as the `failure` parameters. For example,
120-
/// [`AtomicBool::compare_exchange`]
121-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
126+
/// [`AtomicBool::compare_exchange`][compare_exchange].
127+
///
128+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
122129
pub fn atomic_cxchg_failacq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
123130
/// Stores a value if the current value is the same as the `old` value.
124131
/// The stabilized version of this intrinsic is available on the
@@ -127,8 +134,9 @@ extern "rust-intrinsic" {
127134
/// as the `success` and
128135
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
129136
/// as the `failure` parameters. For example,
130-
/// [`AtomicBool::compare_exchange`]
131-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
137+
/// [`AtomicBool::compare_exchange`][compare_exchange].
138+
///
139+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
132140
pub fn atomic_cxchg_acq_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
133141
/// Stores a value if the current value is the same as the `old` value.
134142
/// The stabilized version of this intrinsic is available on the
@@ -137,25 +145,28 @@ extern "rust-intrinsic" {
137145
/// as the `success` and
138146
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
139147
/// as the `failure` parameters. For example,
140-
/// [`AtomicBool::compare_exchange`]
141-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange).
148+
/// [`AtomicBool::compare_exchange`][compare_exchange].
149+
///
150+
/// [compare_exchange]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange
142151
pub fn atomic_cxchg_acqrel_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
143152

144153
/// Stores a value if the current value is the same as the `old` value.
145154
/// The stabilized version of this intrinsic is available on the
146155
/// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
147156
/// [`Ordering::SeqCst`](../../std/sync/atomic/enum.Ordering.html)
148157
/// as both the `success` and `failure` parameters. For example,
149-
/// [`AtomicBool::compare_exchange_weak`]
150-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
158+
/// [`AtomicBool::compare_exchange_weak`][cew].
159+
///
160+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
151161
pub fn atomic_cxchgweak<T>(dst: *mut T, old: T, src: T) -> (T, bool);
152162
/// Stores a value if the current value is the same as the `old` value.
153163
/// The stabilized version of this intrinsic is available on the
154164
/// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
155165
/// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
156166
/// as both the `success` and `failure` parameters. For example,
157-
/// [`AtomicBool::compare_exchange_weak`]
158-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
167+
/// [`AtomicBool::compare_exchange_weak`][cew].
168+
///
169+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
159170
pub fn atomic_cxchgweak_acq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
160171
/// Stores a value if the current value is the same as the `old` value.
161172
/// The stabilized version of this intrinsic is available on the
@@ -164,8 +175,9 @@ extern "rust-intrinsic" {
164175
/// as the `success` and
165176
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
166177
/// as the `failure` parameters. For example,
167-
/// [`AtomicBool::compare_exchange_weak`]
168-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
178+
/// [`AtomicBool::compare_exchange_weak`][cew].
179+
///
180+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
169181
pub fn atomic_cxchgweak_rel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
170182
/// Stores a value if the current value is the same as the `old` value.
171183
/// The stabilized version of this intrinsic is available on the
@@ -174,16 +186,18 @@ extern "rust-intrinsic" {
174186
/// as the `success` and
175187
/// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
176188
/// as the `failure` parameters. For example,
177-
/// [`AtomicBool::compare_exchange_weak`]
178-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
189+
/// [`AtomicBool::compare_exchange_weak`][cew].
190+
///
191+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
179192
pub fn atomic_cxchgweak_acqrel<T>(dst: *mut T, old: T, src: T) -> (T, bool);
180193
/// Stores a value if the current value is the same as the `old` value.
181194
/// The stabilized version of this intrinsic is available on the
182195
/// `std::sync::atomic` types via the `compare_exchange_weak` method by passing
183196
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
184197
/// as both the `success` and `failure` parameters. For example,
185-
/// [`AtomicBool::compare_exchange_weak`]
186-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
198+
/// [`AtomicBool::compare_exchange_weak`][cew].
199+
///
200+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
187201
pub fn atomic_cxchgweak_relaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
188202
/// Stores a value if the current value is the same as the `old` value.
189203
/// The stabilized version of this intrinsic is available on the
@@ -192,8 +206,9 @@ extern "rust-intrinsic" {
192206
/// as the `success` and
193207
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
194208
/// as the `failure` parameters. For example,
195-
/// [`AtomicBool::compare_exchange_weak`]
196-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
209+
/// [`AtomicBool::compare_exchange_weak`][cew].
210+
///
211+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
197212
pub fn atomic_cxchgweak_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
198213
/// Stores a value if the current value is the same as the `old` value.
199214
/// The stabilized version of this intrinsic is available on the
@@ -202,8 +217,9 @@ extern "rust-intrinsic" {
202217
/// as the `success` and
203218
/// [`Ordering::Acquire`](../../std/sync/atomic/enum.Ordering.html)
204219
/// as the `failure` parameters. For example,
205-
/// [`AtomicBool::compare_exchange_weak`]
206-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
220+
/// [`AtomicBool::compare_exchange_weak`][cew].
221+
///
222+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
207223
pub fn atomic_cxchgweak_failacq<T>(dst: *mut T, old: T, src: T) -> (T, bool);
208224
/// Stores a value if the current value is the same as the `old` value.
209225
/// The stabilized version of this intrinsic is available on the
@@ -212,8 +228,9 @@ extern "rust-intrinsic" {
212228
/// as the `success` and
213229
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
214230
/// as the `failure` parameters. For example,
215-
/// [`AtomicBool::compare_exchange_weak`]
216-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
231+
/// [`AtomicBool::compare_exchange_weak`][cew].
232+
///
233+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
217234
pub fn atomic_cxchgweak_acq_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
218235
/// Stores a value if the current value is the same as the `old` value.
219236
/// The stabilized version of this intrinsic is available on the
@@ -222,8 +239,9 @@ extern "rust-intrinsic" {
222239
/// as the `success` and
223240
/// [`Ordering::Relaxed`](../../std/sync/atomic/enum.Ordering.html)
224241
/// as the `failure` parameters. For example,
225-
/// [`AtomicBool::compare_exchange_weak`]
226-
/// (../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak).
242+
/// [`AtomicBool::compare_exchange_weak`][cew].
243+
///
244+
/// [cew]: ../../std/sync/atomic/struct.AtomicBool.html#method.compare_exchange_weak
227245
pub fn atomic_cxchgweak_acqrel_failrelaxed<T>(dst: *mut T, old: T, src: T) -> (T, bool);
228246

229247
/// Loads the current value of the pointer.

Diff for: src/libtest/stats.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ pub trait Stats {
3939
///
4040
/// Note: this method sacrifices performance at the altar of accuracy
4141
/// Depends on IEEE-754 arithmetic guarantees. See proof of correctness at:
42-
/// ["Adaptive Precision Floating-Point Arithmetic and Fast Robust Geometric Predicates"]
43-
/// (http://www.cs.cmu.edu/~quake-papers/robust-arithmetic.ps)
42+
/// ["Adaptive Precision Floating-Point Arithmetic and Fast Robust Geometric
43+
/// Predicates"][paper]
44+
///
45+
/// [paper]: http://www.cs.cmu.edu/~quake-papers/robust-arithmetic.ps
4446
fn sum(&self) -> f64;
4547

4648
/// Minimum value of the samples.

0 commit comments

Comments
 (0)