Skip to content

Commit 59b87b3

Browse files
authored
Auto merge of #37127 - jseyfried:stabilize_RFC_1560, r=nrc
Stabilize RFC 1560 Fixes #13598, fixes #23157, fixes #32303. cc #35120 r? @nrc
2 parents b8f6c20 + 649bcd4 commit 59b87b3

39 files changed

+50
-599
lines changed

src/libcoretest/num/flt2dec/strategy/dragon.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use std::prelude::v1::*;
1212
use std::{i16, f64};
1313
use super::super::*;
14-
use core::num::flt2dec::*;
1514
use core::num::bignum::Big32x40 as Big;
1615
use core::num::flt2dec::strategy::dragon::*;
1716

src/libcoretest/num/flt2dec/strategy/grisu.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
use std::{i16, f64};
1212
use super::super::*;
13-
use core::num::flt2dec::*;
1413
use core::num::flt2dec::strategy::grisu::*;
1514

1615
#[test]

src/librustc/hir/map/collector.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
// except according to those terms.
1010

1111
use super::*;
12-
use super::MapEntry::*;
1312

14-
use hir::*;
1513
use hir::intravisit::Visitor;
1614
use hir::def_id::DefId;
1715
use middle::cstore::InlinedItem;

src/librustc/hir/map/def_collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use super::*;
11+
use hir::map::definitions::*;
1212

1313
use hir;
1414
use hir::intravisit;

src/librustc/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#![feature(core_intrinsics)]
3434
#![cfg_attr(stage0, feature(dotdot_in_tuple_patterns))]
3535
#![feature(enumset)]
36+
#![cfg_attr(stage0, feature(item_like_imports))]
3637
#![feature(libc)]
3738
#![feature(nonzero)]
3839
#![feature(quote)]

src/librustc_mir/hair/cx/expr.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use rustc_const_eval as const_eval;
2121
use rustc::middle::region::CodeExtent;
2222
use rustc::ty::{self, AdtKind, VariantDef, Ty};
2323
use rustc::ty::cast::CastKind as TyCastKind;
24-
use rustc::mir::*;
2524
use rustc::hir;
2625
use syntax::ptr::P;
2726

src/librustc_mir/hair/cx/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
use hair::*;
19-
use rustc::mir::*;
2019
use rustc::mir::transform::MirSource;
2120

2221
use rustc::middle::const_val::ConstVal;

src/librustc_mir/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
2323
#![feature(associated_consts)]
2424
#![feature(box_patterns)]
2525
#![cfg_attr(stage0, feature(dotdot_in_tuple_patterns))]
26+
#![cfg_attr(stage0, feature(item_like_imports))]
2627
#![feature(rustc_diagnostic_macros)]
2728
#![feature(rustc_private)]
2829
#![feature(staged_api)]

src/librustc_resolve/build_reduced_graph.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ impl<'b> Resolver<'b> {
582582
});
583583
} else {
584584
for (name, span) in legacy_imports.imports {
585-
let result = self.resolve_name_in_module(module, name, MacroNS, false, false, None);
585+
let result = self.resolve_name_in_module(module, name, MacroNS, false, None);
586586
if let Success(binding) = result {
587587
self.legacy_import_macro(name, binding, span, allow_shadowing);
588588
} else {
@@ -592,7 +592,7 @@ impl<'b> Resolver<'b> {
592592
}
593593
for (name, span) in legacy_imports.reexports {
594594
self.used_crates.insert(module.def_id().unwrap().krate);
595-
let result = self.resolve_name_in_module(module, name, MacroNS, false, false, None);
595+
let result = self.resolve_name_in_module(module, name, MacroNS, false, None);
596596
if let Success(binding) = result {
597597
self.macro_exports.push(Export { name: name, def: binding.def() });
598598
} else {

src/librustc_resolve/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ items under a new local name.
5959
6060
An example of this error:
6161
62-
```compile_fail
62+
```ignore
6363
use foo::baz;
6464
use bar::*; // error, do `use foo::baz as quux` instead on the previous line
6565

0 commit comments

Comments
 (0)