Skip to content

Commit fa1140b

Browse files
author
Jonathan Turner
authored
Rollup merge of #37023 - jseyfried:fix_extern_crate_back_compat, r=nrc
Fix importing inaccessible `extern crate`s (with a warning) Fixes #36747, fixes #37020, and fixes #37021. r? @nrc
2 parents 3983b87 + 4080efd commit fa1140b

File tree

2 files changed

+27
-1
lines changed

2 files changed

+27
-1
lines changed

src/librustc_resolve/resolve_imports.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ impl<'a> Resolver<'a> {
197197
// If the resolution doesn't depend on glob definability, check privacy and return.
198198
if let Some(result) = self.try_result(&resolution, ns) {
199199
return result.and_then(|binding| {
200-
if self.is_accessible(binding.vis) && !is_disallowed_private_import(binding) {
200+
if self.is_accessible(binding.vis) && !is_disallowed_private_import(binding) ||
201+
binding.is_extern_crate() { // c.f. issue #37020
201202
Success(binding)
202203
} else {
203204
Failed(None)

src/test/run-pass/issue-37020.rs

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![allow(private_in_public)]
12+
13+
mod foo {
14+
pub mod bar {
15+
extern crate core;
16+
}
17+
}
18+
19+
mod baz {
20+
pub use foo::bar::core;
21+
}
22+
23+
fn main() {
24+
baz::core::cell::Cell::new(0u32);
25+
}

0 commit comments

Comments
 (0)