bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #51256 - GuillaumeGomez:fix-rustdoc-crate-name, r=QuietMisdreavus

Browse source 
Fix crate-name option in rustdoc

Fixes #51229.

r? @QuietMisdreavus
This commit is contained in:
Mark Simulacrum 2018-06-05 08:33:47 -06:00 • committed by GitHub
commit ac32f8151b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustdoc/core.rs
View file

@ -230,7 +230,10 @@ pub fn run_core(search_paths: SearchPaths,
let krate = panictry!(driver::phase_1_parse_input(control, &sess, &input));
let name = ::rustc_codegen_utils::link::find_crate_name(Some(&sess), &krate.attrs, &input);
let name = match crate_name {
Some(ref crate_name) => crate_name.clone(),
None => ::rustc_codegen_utils::link::find_crate_name(Some(&sess), &krate.attrs, &input),
};
let mut crate_loader = CrateLoader::new(&sess, &cstore, &name);

13
src/test/rustdoc/invalid.crate.name.rs Normal file
View file

@ -0,0 +1,13 @@
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// compile-flags: --crate-name foo
pub fn foo() {}