X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustdoc%2Fdocfs.rs;h=d59273db08b4f9f50fe7155816a55340893f3ed2;hb=29fe57def2693a3f9b4fcfbb1072b4b655700260;hp=a5fab1b3d42170c7f7ccdd527dae9dca37820cf6;hpb=9af8e378b9c95b8d21987c414862682eb3c5451c;p=rust.git diff --git a/src/librustdoc/docfs.rs b/src/librustdoc/docfs.rs index a5fab1b3d42..d59273db08b 100644 --- a/src/librustdoc/docfs.rs +++ b/src/librustdoc/docfs.rs @@ -15,15 +15,6 @@ use std::string::ToString; use std::sync::mpsc::Sender; -macro_rules! try_err { - ($e:expr, $file:expr) => { - match $e { - Ok(e) => e, - Err(e) => return Err(E::new(e, $file)), - } - }; -} - crate trait PathError { fn new>(e: S, path: P) -> Self where @@ -75,7 +66,7 @@ impl DocFS { }); }); } else { - try_err!(fs::write(&path, contents), path); + fs::write(&path, contents).map_err(|e| E::new(e, path))?; } Ok(()) }