Skip to content

Commit

Permalink
Rollup merge of rust-lang#37023 - jseyfried:fix_extern_crate_back_com…
Browse files Browse the repository at this point in the history
…pat, r=nrc

Fix importing inaccessible `extern crate`s (with a warning)

Fixes rust-lang#36747, fixes rust-lang#37020, and fixes rust-lang#37021.
r? @nrc
  • Loading branch information
Jonathan Turner authored Oct 11, 2016
2 parents 3983b87 + 4080efd commit fa1140b
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/librustc_resolve/resolve_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ impl<'a> Resolver<'a> {
// If the resolution doesn't depend on glob definability, check privacy and return.
if let Some(result) = self.try_result(&resolution, ns) {
return result.and_then(|binding| {
if self.is_accessible(binding.vis) && !is_disallowed_private_import(binding) {
if self.is_accessible(binding.vis) && !is_disallowed_private_import(binding) ||
binding.is_extern_crate() { // c.f. issue #37020
Success(binding)
} else {
Failed(None)
Expand Down
25 changes: 25 additions & 0 deletions src/test/run-pass/issue-37020.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2016 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.

#![allow(private_in_public)]

mod foo {
pub mod bar {
extern crate core;
}
}

mod baz {
pub use foo::bar::core;
}

fn main() {
baz::core::cell::Cell::new(0u32);
}

0 comments on commit fa1140b

Please sign in to comment.