Merge #11418

11418: fix: Update dependency, fix Markdown references r=Veykril a=HansAuger Stumbled across this accidentally while familiarizing myself with the code base. Update `pulldown-cmark-to-cmark` Fix for #11008 Co-authored-by: Moritz Vetter <[email protected]>
rust-lang · Feb 6, 2022 · d2d137a · d2d137a
2 parents 6689470 + ba2ef69
commit d2d137a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
@@ -17,7 +17,7 @@ itertools = "0.10.0"
 tracing = "0.1"
 rustc-hash = "1.1.0"
 oorandom = "11.1.2"
-pulldown-cmark-to-cmark = "9.0"
+pulldown-cmark-to-cmark = "10.0.0"
 pulldown-cmark = { version = "0.9", default-features = false }
 url = "2.1.1"
 dot = "0.1.4"

diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
@@ -7,7 +7,7 @@ mod intra_doc_links;
 
 use either::Either;
 use pulldown_cmark::{BrokenLink, CowStr, Event, InlineStr, LinkType, Options, Parser, Tag};
-use pulldown_cmark_to_cmark::{cmark_with_options, Options as CMarkOptions};
+use pulldown_cmark_to_cmark::{cmark_resume_with_options, Options as CMarkOptions};
 use stdx::format_to;
 use url::Url;
 
@@ -61,7 +61,7 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: Defin
         }
     });
     let mut out = String::new();
-    cmark_with_options(
+    cmark_resume_with_options(
         doc,
         &mut out,
         None,
@@ -97,7 +97,7 @@ pub(crate) fn remove_links(markdown: &str) -> String {
     });
 
     let mut out = String::new();
-    cmark_with_options(
+    cmark_resume_with_options(
         doc,
         &mut out,
         None,

diff --git a/crates/ide/src/doc_links/tests.rs b/crates/ide/src/doc_links/tests.rs
@@ -394,7 +394,6 @@ pub struct $0Foo;
 "#,
         expect![[r#"[my Foo](https://docs.rs/foo/*/foo/struct.Foo.html)"#]],
     );
-    // FIXME #11008
     check_rewrite(
         r#"
 //- /main.rs crate:foo
@@ -403,9 +402,6 @@ pub struct $0Foo;
 /// [`foo`]: Foo
 pub struct $0Foo;
 "#,
-        expect![[r#"
-            [`foo`]
-
-            []: https://docs.rs/foo/*/foo/struct.Foo.html"#]],
+        expect![["[`foo`]"]],
     );
 }