diff options
| author | bors <bors@rust-lang.org> | 2024-08-19 09:50:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-08-19 09:50:33 +0000 |
| commit | 45fbf41deb24581471e3e56824d9318d3d415cb8 (patch) | |
| tree | 4ff26763ff694f4cb48485727da4c5ffa06e8559 /tests | |
| parent | e3f909b2bbd0b10db6f164d466db237c582d3045 (diff) | |
| parent | 370168787bd6f2ed26788a51af97166d868e0609 (diff) | |
| download | rust-45fbf41deb24581471e3e56824d9318d3d415cb8.tar.gz rust-45fbf41deb24581471e3e56824d9318d3d415cb8.zip | |
Auto merge of #128722 - tgross35:new-resolver-root, r=Mark-Simulacrum
Switch to using the v2 resolver in most workspaces
Pinning the resolver to v1 was done in 5abff3753a7c ("Explicit set workspace.resolver ...") in order to suppress warnings. Since there is no specific reason not to use the new resolver and since it fixes issues, change to `resolver = "2"` everywhere except library.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rustdoc-ui/unportable-markdown.rs | 1 | ||||
| -rw-r--r-- | tests/rustdoc-ui/unportable-markdown.stderr | 26 |
2 files changed, 5 insertions, 22 deletions
diff --git a/tests/rustdoc-ui/unportable-markdown.rs b/tests/rustdoc-ui/unportable-markdown.rs index 8035e680f3c..105fc1e59d5 100644 --- a/tests/rustdoc-ui/unportable-markdown.rs +++ b/tests/rustdoc-ui/unportable-markdown.rs @@ -19,7 +19,6 @@ pub struct GfmFootnotes; /// <https://github.com/pulldown-cmark/pulldown-cmark/pull/773> /// /// test [^foo][^bar] -//~^ ERROR unportable markdown /// /// [^foo]: test /// [^bar]: test2 diff --git a/tests/rustdoc-ui/unportable-markdown.stderr b/tests/rustdoc-ui/unportable-markdown.stderr index b524aca25ae..952ae4bb6ee 100644 --- a/tests/rustdoc-ui/unportable-markdown.stderr +++ b/tests/rustdoc-ui/unportable-markdown.stderr @@ -1,31 +1,15 @@ error: unportable markdown - --> $DIR/unportable-markdown.rs:21:10 + --> $DIR/unportable-markdown.rs:48:5 | -LL | /// test [^foo][^bar] - | ^^^^^^ +LL | /// >bar + | ^ | - = help: confusing footnote reference and link + = help: confusing block quote with no space after the `>` marker note: the lint level is defined here --> $DIR/unportable-markdown.rs:8:9 | LL | #![deny(rustdoc::unportable_markdown)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -help: if it should not be a footnote, escape it - | -LL | /// test \[^foo][^bar] - | + -help: if the footnote is intended, add a space - | -LL | /// test [^foo] [^bar] - | + - -error: unportable markdown - --> $DIR/unportable-markdown.rs:49:5 - | -LL | /// >bar - | ^ - | - = help: confusing block quote with no space after the `>` marker help: if the quote is intended, add a space | LL | /// > bar @@ -35,5 +19,5 @@ help: if it should not be a quote, escape it LL | /// \>bar | + -error: aborting due to 2 previous errors +error: aborting due to 1 previous error |