From 0c2f76a4bf515a9c1bdb930ffb7f32b7ba6bd726 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Thu, 17 Dec 2020 11:40:02 -0500 Subject: [PATCH] Fix rebase conflict --- src/librustdoc/lib.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 0275a6ecd093..72f1b817d5d8 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -558,10 +558,6 @@ fn main_options(options: config::Options) -> MainResult { }); info!("finished with rustc"); - if let Some(name) = crate_name { - krate.name = name - } - krate.version = crate_version; if show_coverage {