Auto merge of #84511 - davidhewitt:revert-84445, r=GuillaumeGomez
Revert "rustdoc: Hide `#text` in doc-tests" See discussion in #84502 - I'm worried that #84445 may cause a lot of breakages if this were to hit stable, so I think it's safer to revert and work on the known correct fix #84478.
This commit is contained in:
commit
42816d61ea
3 changed files with 6 additions and 44 deletions
|
@ -147,19 +147,12 @@ fn map_line(s: &str) -> Line<'_> {
|
|||
let trimmed = s.trim();
|
||||
if trimmed.starts_with("##") {
|
||||
Line::Shown(Cow::Owned(s.replacen("##", "#", 1)))
|
||||
} else if trimmed.starts_with('#') {
|
||||
let mut without_hash = trimmed[1..].trim_start();
|
||||
if without_hash.starts_with('!') {
|
||||
// #! text
|
||||
without_hash = without_hash[1..].trim_start_matches(' ');
|
||||
}
|
||||
if without_hash.starts_with('[') {
|
||||
// #[attr] or #![attr]
|
||||
Line::Shown(Cow::Borrowed(s))
|
||||
} else {
|
||||
// #text
|
||||
Line::Hidden(without_hash)
|
||||
}
|
||||
} else if let Some(stripped) = trimmed.strip_prefix("# ") {
|
||||
// # text
|
||||
Line::Hidden(&stripped)
|
||||
} else if trimmed == "#" {
|
||||
// We cannot handle '#text' because it could be #[attr].
|
||||
Line::Hidden("")
|
||||
} else {
|
||||
Line::Shown(Cow::Borrowed(s))
|
||||
}
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
// check-pass
|
||||
// compile-flags:--test
|
||||
// normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
|
||||
// normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
|
||||
|
||||
/// ```
|
||||
// If `const_err` becomes a hard error in the future, please replace this with another
|
||||
// deny-by-default lint instead of removing it altogether
|
||||
/// # ! [allow(const_err)]
|
||||
/// const C: usize = 1/0;
|
||||
///
|
||||
/// # use std::path::PathBuf;
|
||||
/// #use std::path::Path;
|
||||
/// let x = Path::new("y.rs");
|
||||
/// let x = PathBuf::from("y.rs");
|
||||
///
|
||||
/// #[cfg(FALSE)]
|
||||
/// assert!(false);
|
||||
///
|
||||
/// # [cfg(FALSE)]
|
||||
/// assert!(false);
|
||||
/// ```
|
||||
fn main() {
|
||||
panic!();
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
|
||||
running 1 test
|
||||
test $DIR/test-hidden.rs - main (line 6) ... ok
|
||||
|
||||
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
|
||||
|
Loading…
Reference in a new issue