refactor(toolchain): allow passing a fragment in Toolchain::doc_path()

Author: rami3l

src/cli/rustup_mode.rs

@@ -1531,7 +1531,7 @@ async fn doc(
     } else {
         writeln!(cfg.process.stderr().lock(), "Opening docs in your browser")?;
     }
-    toolchain.open_docs(&doc_path)?;
+    toolchain.open_docs(&doc_path, None)?;
     Ok(utils::ExitCode(0))
 }
 

src/toolchain.rs

@@ -10,9 +10,10 @@ use std::{
     time::Duration,
 };
 
-use anyhow::{anyhow, bail};
+use anyhow::{anyhow, bail, Context};
 use fs_at::OpenOptions;
 use tracing::info;
+use url::Url;
 use wait_timeout::ChildExt;
 
 use crate::{
@@ -421,8 +422,17 @@ impl<'a> Toolchain<'a> {
         Ok(doc_dir)
     }
 
-    pub fn open_docs(&self, relative: impl AsRef<Path>) -> anyhow::Result<()> {
-        utils::open_browser(&self.doc_path(relative)?)
+    pub fn open_docs(
+        &self,
+        relative: impl AsRef<Path>,
+        fragment: Option<&str>,
+    ) -> anyhow::Result<()> {
+        let relative = relative.as_ref();
+        let mut doc_url = Url::from_file_path(self.doc_path(relative)?)
+            .ok()
+            .with_context(|| anyhow!("invalid doc file absolute path `{}`", relative.display()))?;
+        doc_url.set_fragment(fragment);
+        utils::open_browser(doc_url.to_string())
     }
 
     /// Remove the toolchain from disk

src/utils/mod.rs

@@ -1,6 +1,7 @@
 //!  Utility functions for Rustup
 
 use std::env;
+use std::ffi::OsStr;
 use std::fs::{self, File};
 use std::io::{self, BufReader, Write};
 use std::ops::{BitAnd, BitAndAssign};
@@ -459,7 +460,7 @@ pub(crate) fn read_dir(name: &'static str, path: &Path) -> Result<fs::ReadDir> {
     })
 }
 
-pub(crate) fn open_browser(path: &Path) -> Result<()> {
+pub(crate) fn open_browser(path: impl AsRef<OsStr>) -> Result<()> {
     opener::open_browser(path).context("couldn't open browser")
 }