diff options
| author | bors <bors@rust-lang.org> | 2024-03-30 15:45:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-03-30 15:45:01 +0000 |
| commit | f04352a7dd010c0c37c835cd1b72c402460dffe3 (patch) | |
| tree | ce842ad3b1cf0c59ba918a6aea6470096e3a280a | |
| parent | d3accba79b4f700527b6a0e0d05a78127fccf694 (diff) | |
| parent | a8b0f6f239aed52824682c42a3753687483a2607 (diff) | |
| download | rust-f04352a7dd010c0c37c835cd1b72c402460dffe3.tar.gz rust-f04352a7dd010c0c37c835cd1b72c402460dffe3.zip | |
Auto merge of #3430 - RalfJung:doc, r=RalfJung
make some doc comments not doc tests `./miri test --doc` will run doctests even if we have them disabled (that's a cargo quirk: https://github.com/rust-lang/cargo/issues/13668). This fixes that command to not fail.
| -rw-r--r-- | src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs | 8 | ||||
| -rw-r--r-- | src/tools/miri/src/borrow_tracker/tree_borrows/unimap.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs index 4394e3c2c86..2690bc026a1 100644 --- a/src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs +++ b/src/tools/miri/src/borrow_tracker/tree_borrows/diagnostics.rs @@ -365,7 +365,7 @@ type S = &'static str; /// Pretty-printing details /// /// Example: -/// ``` +/// ```rust,ignore (private type) /// DisplayFmtWrapper { /// top: '>', /// bot: '<', @@ -393,7 +393,7 @@ struct DisplayFmtWrapper { /// Formating of the permissions on each range. /// /// Example: -/// ``` +/// ```rust,ignore (private type) /// DisplayFmtPermission { /// open: "[", /// sep: "|", @@ -425,7 +425,7 @@ struct DisplayFmtPermission { /// Formating of the tree structure. /// /// Example: -/// ``` +/// ```rust,ignore (private type) /// DisplayFmtPadding { /// join_middle: "|-", /// join_last: "'-", @@ -463,7 +463,7 @@ struct DisplayFmtPadding { /// How to show whether a location has been accessed /// /// Example: -/// ``` +/// ```rust,ignore (private type) /// DisplayFmtAccess { /// yes: " ", /// no: "?", diff --git a/src/tools/miri/src/borrow_tracker/tree_borrows/unimap.rs b/src/tools/miri/src/borrow_tracker/tree_borrows/unimap.rs index d9cad9c8e0b..f45b2d9e00a 100644 --- a/src/tools/miri/src/borrow_tracker/tree_borrows/unimap.rs +++ b/src/tools/miri/src/borrow_tracker/tree_borrows/unimap.rs @@ -132,7 +132,7 @@ where /// the associated `UniIndex` from ALL `UniValMap`s. /// /// Example of such behavior: - /// ``` + /// ```rust,ignore (private type can't be doctested) /// let mut keymap = UniKeyMap::<char>::default(); /// let mut valmap = UniValMap::<char>::default(); /// // Insert 'a' -> _ -> 'A' |