diff options
| author | Joshua Nelson <jyn514@gmail.com> | 2020-12-17 11:40:02 -0500 |
|---|---|---|
| committer | Joshua Nelson <jyn514@gmail.com> | 2020-12-17 11:40:02 -0500 |
| commit | 0c2f76a4bf515a9c1bdb930ffb7f32b7ba6bd726 (patch) | |
| tree | 6f060856002b29a9834a4d54764dd0b19291646e /src | |
| parent | b421f2e8e94e578ed200dde235b7510b6a7014ba (diff) | |
| download | rust-0c2f76a4bf515a9c1bdb930ffb7f32b7ba6bd726.tar.gz rust-0c2f76a4bf515a9c1bdb930ffb7f32b7ba6bd726.zip | |
Fix rebase conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/lib.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 0275a6ecd09..72f1b817d5d 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 { |