Skip to content

Commit 6734dcc

Browse files
committed
Auto merge of #30325 - jseyfried:fixes_30078, r=nrc
This fixes a bug in which unused imports can get wrongly marked as used when checking for unused qualifications in `resolve_path` (issue #30078), and it removes unused imports that were previously undetected because of the bug.
2 parents 9687a8a + ba20a86 commit 6734dcc

File tree

44 files changed

+60
-75
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+60
-75
lines changed

src/compiletest/runtest.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
use self::TargetLocation::*;
12-
1311
use common::Config;
1412
use common::{CompileFail, ParseFail, Pretty, RunFail, RunPass, RunPassValgrind};
1513
use common::{Codegen, DebugInfoLldb, DebugInfoGdb, Rustdoc};

src/libcollections/btree/node.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use core::marker::PhantomData;
2323
use core::ops::{Deref, DerefMut, Index, IndexMut};
2424
use core::ptr::Unique;
2525
use core::{slice, mem, ptr, cmp};
26-
use alloc::heap::{self, EMPTY};
26+
use alloc::heap;
2727

2828
use borrow::Borrow;
2929

src/libcollections/string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use core::fmt;
2323
use core::hash;
2424
use core::iter::FromIterator;
2525
use core::mem;
26-
use core::ops::{self, Deref, Add, Index};
26+
use core::ops::{self, Add};
2727
use core::ptr;
2828
use core::slice;
2929
use core::str::pattern::Pattern;

src/libcollections/vec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ use core::hash::{self, Hash};
6868
use core::intrinsics::{arith_offset, assume, needs_drop};
6969
use core::iter::FromIterator;
7070
use core::mem;
71-
use core::ops::{Index, IndexMut, Deref};
71+
use core::ops::{Index, IndexMut};
7272
use core::ops;
7373
use core::ptr;
7474
use core::slice;

src/libcore/slice.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ use result::Result;
4848
use result::Result::{Ok, Err};
4949
use ptr;
5050
use mem;
51-
use mem::size_of;
5251
use marker::{Send, Sync, self};
5352
use num::wrapping::OverflowingOps;
5453
use raw::Repr;

src/librustc/lint/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
use self::TargetLint::*;
2727

2828
use middle::privacy::AccessLevels;
29-
use middle::ty::{self, Ty};
29+
use middle::ty;
3030
use session::{early_error, Session};
3131
use lint::{Level, LevelSource, Lint, LintId, LintArray, LintPass};
3232
use lint::{EarlyLintPass, EarlyLintPassObject, LateLintPass, LateLintPassObject};

src/librustc/middle/infer/combine.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ use super::{InferCtxt};
4141
use super::{MiscVariable, TypeTrace};
4242
use super::type_variable::{RelationDir, BiTo, EqTo, SubtypeOf, SupertypeOf};
4343

44-
use middle::ty::{TyVar};
4544
use middle::ty::{IntType, UintType};
4645
use middle::ty::{self, Ty};
4746
use middle::ty::error::TypeError;

src/librustc/middle/infer/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ use middle::region::CodeExtent;
2727
use middle::subst;
2828
use middle::subst::Substs;
2929
use middle::subst::Subst;
30-
use middle::traits::{self, FulfillmentContext, Normalized,
31-
SelectionContext, ObligationCause};
30+
use middle::traits;
3231
use middle::ty::adjustment;
33-
use middle::ty::{TyVid, IntVid, FloatVid, RegionVid};
32+
use middle::ty::{TyVid, IntVid, FloatVid};
3433
use middle::ty::{self, Ty, HasTypeFlags};
3534
use middle::ty::error::{ExpectedFound, TypeError, UnconstrainedNumeric};
3635
use middle::ty::fold::{TypeFolder, TypeFoldable};

src/librustc/middle/infer/region_inference/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use rustc_data_structures::graph::{self, Direction, NodeIndex};
2424
use rustc_data_structures::unify::{self, UnificationTable};
2525
use middle::free_region::FreeRegionMap;
2626
use middle::ty::{self, Ty};
27-
use middle::ty::{BoundRegion, FreeRegion, Region, RegionVid};
27+
use middle::ty::{BoundRegion, Region, RegionVid};
2828
use middle::ty::{ReEmpty, ReStatic, ReFree, ReEarlyBound};
2929
use middle::ty::{ReLateBound, ReScope, ReVar, ReSkolemized, BrFresh};
3030
use middle::ty::error::TypeError;

src/librustc/middle/stability.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use syntax::attr::{self, Stability, Deprecation, AttrMetaMethods};
2929
use util::nodemap::{DefIdMap, FnvHashSet, FnvHashMap};
3030

3131
use rustc_front::hir;
32-
use rustc_front::hir::{Block, Crate, Item, Generics, StructField, Variant};
32+
use rustc_front::hir::{Crate, Item, Generics, StructField, Variant};
3333
use rustc_front::intravisit::{self, Visitor};
3434

3535
use std::mem::replace;

0 commit comments

Comments
 (0)