Skip to content

Commit cd73c86

Browse files
committed
Auto merge of rust-lang#2202 - InfRandomness:infrandomness/rustdoc-fixes, r=RalfJung
Fix rustdoc warnings This fixes the rustdoc warnings presented by the tool
2 parents 1c711a1 + 3ba6456 commit cd73c86

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/data_race.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
//! Implementation of a data-race detector using Lamport Timestamps / Vector-clocks
22
//! based on the Dynamic Race Detection for C++:
3-
//! https://www.doc.ic.ac.uk/~afd/homepages/papers/pdfs/2017/POPL.pdf
3+
//! <https://www.doc.ic.ac.uk/~afd/homepages/papers/pdfs/2017/POPL.pdf>
44
//! which does not report false-positives when fences are used, and gives better
55
//! accuracy in presence of read-modify-write operations.
66
//!
77
//! The implementation contains modifications to correctly model the changes to the memory model in C++20
8-
//! regarding the weakening of release sequences: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0982r1.html.
8+
//! regarding the weakening of release sequences: <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0982r1.html>.
99
//! Relaxed stores now unconditionally block all currently active release sequences and so per-thread tracking of release
1010
//! sequences is not needed.
1111
//!
@@ -15,7 +15,7 @@
1515
//! This does not explore weak memory orders and so can still miss data-races
1616
//! but should not report false-positives
1717
//!
18-
//! Data-race definition from(https://en.cppreference.com/w/cpp/language/memory_model#Threads_and_data_races):
18+
//! Data-race definition from(<https://en.cppreference.com/w/cpp/language/memory_model#Threads_and_data_races>):
1919
//! a data race occurs between two memory accesses if they are on different threads, at least one operation
2020
//! is non-atomic, at least one operation is a write and neither access happens-before the other. Read the link
2121
//! for full definition.
@@ -24,7 +24,7 @@
2424
//! because it only re-uses vector indexes once all currently-active (not-terminated) threads have an internal
2525
//! vector clock that happens-after the join operation of the candidate thread. Threads that have not been joined
2626
//! on are not considered. Since the thread's vector clock will only increase and a data-race implies that
27-
//! there is some index x where clock[x] > thread_clock, when this is true clock[candidate-idx] > thread_clock
27+
//! there is some index x where clock\[x\] > thread_clock, when this is true clock\[candidate-idx\] > thread_clock
2828
//! can never hold and hence a data-race can never be reported in that vector index again.
2929
//! This means that the thread-index can be safely re-used, starting on the next timestamp for the newly created
3030
//! thread.

src/shims/tls.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ impl<'tcx> TlsData<'tcx> {
135135
/// [`_tlv_atexit`
136136
/// implementation](https://github.com/opensource-apple/dyld/blob/195030646877261f0c8c7ad8b001f52d6a26f514/src/threadLocalVariables.c#L389):
137137
///
138-
/// // NOTE: this does not need locks because it only operates on current thread data
138+
/// NOTE: this does not need locks because it only operates on current thread data
139139
pub fn set_macos_thread_dtor(
140140
&mut self,
141141
thread: ThreadId,
@@ -347,7 +347,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
347347
/// Note: we consistently run TLS destructors for all threads, including the
348348
/// main thread. However, it is not clear that we should run the TLS
349349
/// destructors for the main thread. See issue:
350-
/// https://github.com/rust-lang/rust/issues/28129.
350+
/// <https://github.com/rust-lang/rust/issues/28129>.
351351
fn schedule_next_tls_dtor_for_active_thread(&mut self) -> InterpResult<'tcx> {
352352
let this = self.eval_context_mut();
353353
let active_thread = this.get_active_thread();

src/stacked_borrows.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
945945
/// it does not alias with anything.
946946
///
947947
/// This is a HACK because there is nothing in MIR that would make the retag
948-
/// explicit. Also see https://github.com/rust-lang/rust/issues/71117.
948+
/// explicit. Also see <https://github.com/rust-lang/rust/issues/71117>.
949949
fn retag_return_place(&mut self) -> InterpResult<'tcx> {
950950
let this = self.eval_context_mut();
951951
let return_place = this.frame_mut().return_place;

0 commit comments

Comments
 (0)