Skip to content

Commit 638b260

Browse files
committed
Auto merge of #28689 - Manishearth:rollup, r=Manishearth
- Successful merges: #28664, #28673, #28681, #28682, #28688 - Failed merges:
2 parents 219eca1 + c34f3ea commit 638b260

Some content is hidden

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

47 files changed

+195
-122
lines changed

src/libcollections/enum_set.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,7 @@ impl<E> Clone for EnumSet<E> {
4949
#[stable(feature = "rust1", since = "1.0.0")]
5050
impl<E:CLike + fmt::Debug> fmt::Debug for EnumSet<E> {
5151
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
52-
try!(write!(fmt, "{{"));
53-
let mut first = true;
54-
for e in self {
55-
if !first {
56-
try!(write!(fmt, ", "));
57-
}
58-
try!(write!(fmt, "{:?}", e));
59-
first = false;
60-
}
61-
write!(fmt, "}}")
52+
fmt.debug_set().entries(self).finish()
6253
}
6354
}
6455

src/libcollections/str.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,6 @@ impl str {
506506
///
507507
/// # Examples
508508
/// ```
509-
/// #![feature(str_split_at)]
510-
///
511509
/// let s = "Löwe 老虎 Léopard";
512510
/// let first_space = s.find(' ').unwrap_or(s.len());
513511
/// let (a, b) = s.split_at(first_space);

src/libcollections/vec.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,8 +753,6 @@ impl<T> Vec<T> {
753753
/// # Examples
754754
///
755755
/// ```
756-
/// #![feature(split_off)]
757-
///
758756
/// let mut vec = vec![1,2,3];
759757
/// let vec2 = vec.split_off(1);
760758
/// assert_eq!(vec, [1]);

src/libcollections/vec_deque.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,8 +1319,6 @@ impl<T> VecDeque<T> {
13191319
/// # Examples
13201320
///
13211321
/// ```
1322-
/// #![feature(split_off)]
1323-
///
13241322
/// use std::collections::VecDeque;
13251323
///
13261324
/// let mut buf: VecDeque<_> = vec![1,2,3].into_iter().collect();
@@ -1406,8 +1404,6 @@ impl<T> VecDeque<T> {
14061404
/// # Examples
14071405
///
14081406
/// ```
1409-
/// #![feature(vec_deque_retain)]
1410-
///
14111407
/// use std::collections::VecDeque;
14121408
///
14131409
/// let mut buf = VecDeque::new();
@@ -1787,14 +1783,7 @@ impl<'a, T: 'a + Copy> Extend<&'a T> for VecDeque<T> {
17871783
#[stable(feature = "rust1", since = "1.0.0")]
17881784
impl<T: fmt::Debug> fmt::Debug for VecDeque<T> {
17891785
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
1790-
try!(write!(f, "["));
1791-
1792-
for (i, e) in self.iter().enumerate() {
1793-
if i != 0 { try!(write!(f, ", ")); }
1794-
try!(write!(f, "{:?}", *e));
1795-
}
1796-
1797-
write!(f, "]")
1786+
f.debug_list().entries(self).finish()
17981787
}
17991788
}
18001789

src/libcollectionstest/lib.rs

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

1111
#![feature(ascii)]
12-
#![feature(append)]
1312
#![feature(binary_heap_extras)]
1413
#![feature(box_syntax)]
1514
#![feature(btree_range)]
@@ -29,18 +28,14 @@
2928
#![feature(set_recovery)]
3029
#![feature(slice_bytes)]
3130
#![feature(slice_splits)]
32-
#![feature(split_off)]
3331
#![feature(step_by)]
3432
#![feature(str_char)]
3533
#![feature(str_escape)]
3634
#![feature(str_match_indices)]
37-
#![feature(str_split_at)]
3835
#![feature(str_utf16)]
39-
#![feature(box_str)]
4036
#![feature(test)]
4137
#![feature(unboxed_closures)]
4238
#![feature(unicode)]
43-
#![feature(vec_deque_retain)]
4439
#![feature(vec_push_all)]
4540

4641
#[macro_use] extern crate log;

src/librustc/middle/infer/mod.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use std::rc::Rc;
4343
use syntax::ast;
4444
use syntax::codemap;
4545
use syntax::codemap::{Span, DUMMY_SP};
46-
use util::nodemap::{FnvHashMap, NodeMap};
46+
use util::nodemap::{FnvHashMap, FnvHashSet, NodeMap};
4747

4848
use self::combine::CombineFields;
4949
use self::region_inference::{RegionVarBindings, RegionSnapshot};
@@ -92,6 +92,10 @@ pub struct InferCtxt<'a, 'tcx: 'a> {
9292

9393
pub fulfillment_cx: RefCell<traits::FulfillmentContext<'tcx>>,
9494

95+
// the set of predicates on which errors have been reported, to
96+
// avoid reporting the same error twice.
97+
pub reported_trait_errors: RefCell<FnvHashSet<traits::TraitErrorKey<'tcx>>>,
98+
9599
// This is a temporary field used for toggling on normalization in the inference context,
96100
// as we move towards the approach described here:
97101
// https://internals.rust-lang.org/t/flattening-the-contexts-for-fun-and-profit/2293
@@ -374,6 +378,7 @@ pub fn new_infer_ctxt<'a, 'tcx>(tcx: &'a ty::ctxt<'tcx>,
374378
region_vars: RegionVarBindings::new(tcx),
375379
parameter_environment: param_env.unwrap_or(tcx.empty_parameter_environment()),
376380
fulfillment_cx: RefCell::new(traits::FulfillmentContext::new(errors_will_be_reported)),
381+
reported_trait_errors: RefCell::new(FnvHashSet()),
377382
normalize: false,
378383
err_count_on_creation: tcx.sess.err_count()
379384
}

src/librustc/middle/reachable.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,13 +348,17 @@ impl<'a, 'tcx> ReachableContext<'a, 'tcx> {
348348
// this properly would result in the necessity of computing *type*
349349
// reachability, which might result in a compile time loss.
350350
fn mark_destructors_reachable(&mut self) {
351-
for adt in self.tcx.adt_defs() {
352-
if let Some(destructor_def_id) = adt.destructor() {
353-
if destructor_def_id.is_local() {
354-
self.reachable_symbols.insert(destructor_def_id.node);
351+
let drop_trait = match self.tcx.lang_items.drop_trait() {
352+
Some(id) => self.tcx.lookup_trait_def(id), None => { return }
353+
};
354+
drop_trait.for_each_impl(self.tcx, |drop_impl| {
355+
for destructor in &self.tcx.impl_items.borrow()[&drop_impl] {
356+
let destructor_did = destructor.def_id();
357+
if destructor_did.is_local() {
358+
self.reachable_symbols.insert(destructor_did.node);
355359
}
356360
}
357-
}
361+
})
358362
}
359363
}
360364

src/librustc/middle/traits/error_reporting.rs

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,32 @@ use middle::def_id::DefId;
2828
use middle::infer::InferCtxt;
2929
use middle::ty::{self, ToPredicate, HasTypeFlags, ToPolyTraitRef, TraitRef, Ty};
3030
use middle::ty::fold::TypeFoldable;
31-
use std::collections::HashMap;
31+
use util::nodemap::{FnvHashMap, FnvHashSet};
32+
3233
use std::fmt;
3334
use syntax::codemap::Span;
3435
use syntax::attr::{AttributeMethods, AttrMetaMethods};
3536

37+
#[derive(Debug, PartialEq, Eq, Hash)]
38+
pub struct TraitErrorKey<'tcx> {
39+
is_warning: bool,
40+
span: Span,
41+
predicate: ty::Predicate<'tcx>
42+
}
43+
44+
impl<'tcx> TraitErrorKey<'tcx> {
45+
fn from_error<'a>(infcx: &InferCtxt<'a, 'tcx>,
46+
e: &FulfillmentError<'tcx>) -> Self {
47+
let predicate =
48+
infcx.resolve_type_vars_if_possible(&e.obligation.predicate);
49+
TraitErrorKey {
50+
is_warning: is_warning(&e.obligation),
51+
span: e.obligation.cause.span,
52+
predicate: infcx.tcx.erase_regions(&predicate)
53+
}
54+
}
55+
}
56+
3657
pub fn report_fulfillment_errors<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
3758
errors: &Vec<FulfillmentError<'tcx>>) {
3859
for error in errors {
@@ -42,6 +63,13 @@ pub fn report_fulfillment_errors<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
4263

4364
fn report_fulfillment_error<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
4465
error: &FulfillmentError<'tcx>) {
66+
let error_key = TraitErrorKey::from_error(infcx, error);
67+
debug!("report_fulfillment_errors({:?}) - key={:?}",
68+
error, error_key);
69+
if !infcx.reported_trait_errors.borrow_mut().insert(error_key) {
70+
debug!("report_fulfillment_errors: skipping duplicate");
71+
return;
72+
}
4573
match error.code {
4674
FulfillmentErrorCode::CodeSelectionError(ref e) => {
4775
report_selection_error(infcx, &error.obligation, e);
@@ -97,7 +125,7 @@ fn report_on_unimplemented<'a, 'tcx>(infcx: &InferCtxt<'a, 'tcx>,
97125
(gen.name.as_str().to_string(),
98126
trait_ref.substs.types.get(param, i)
99127
.to_string())
100-
}).collect::<HashMap<String, String>>();
128+
}).collect::<FnvHashMap<String, String>>();
101129
generic_map.insert("Self".to_string(),
102130
trait_ref.self_ty().to_string());
103131
let parser = Parser::new(&istring);
@@ -308,7 +336,11 @@ pub fn report_object_safety_error<'tcx>(tcx: &ty::ctxt<'tcx>,
308336
"the trait `{}` cannot be made into an object",
309337
tcx.item_path_str(trait_def_id));
310338

339+
let mut reported_violations = FnvHashSet();
311340
for violation in violations {
341+
if !reported_violations.insert(violation.clone()) {
342+
continue;
343+
}
312344
match violation {
313345
ObjectSafetyViolation::SizedSelf => {
314346
tcx.sess.fileline_note(

src/librustc/middle/traits/fulfill.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ pub struct FulfillmentContext<'tcx> {
4949
// than the `SelectionCache`: it avoids duplicate errors and
5050
// permits recursive obligations, which are often generated from
5151
// traits like `Send` et al.
52+
//
53+
// Note that because of type inference, a predicate can still
54+
// occur twice in the predicates list, for example when 2
55+
// initially-distinct type variables are unified after being
56+
// inserted. Deduplicating the predicate set on selection had a
57+
// significant performance cost the last time I checked.
5258
duplicate_set: FulfilledPredicates<'tcx>,
5359

5460
// A list of all obligations that have been registered with this

src/librustc/middle/traits/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ use middle::subst;
2121
use middle::ty::{self, HasTypeFlags, Ty};
2222
use middle::ty::fold::TypeFoldable;
2323
use middle::infer::{self, fixup_err_to_string, InferCtxt};
24+
2425
use std::rc::Rc;
2526
use syntax::ast;
2627
use syntax::codemap::{Span, DUMMY_SP};
2728

29+
pub use self::error_reporting::TraitErrorKey;
2830
pub use self::error_reporting::report_fulfillment_errors;
2931
pub use self::error_reporting::report_overflow_error;
3032
pub use self::error_reporting::report_selection_error;

src/librustc/middle/traits/object_safety.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use middle::ty::{self, ToPolyTraitRef, Ty};
2727
use std::rc::Rc;
2828
use syntax::ast;
2929

30-
#[derive(Debug)]
30+
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
3131
pub enum ObjectSafetyViolation<'tcx> {
3232
/// Self : Sized declared on the trait
3333
SizedSelf,

src/librustc/middle/ty/context.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,6 @@ pub struct ctxt<'tcx> {
245245
/// True if the variance has been computed yet; false otherwise.
246246
pub variance_computed: Cell<bool>,
247247

248-
/// A method will be in this list if and only if it is a destructor.
249-
pub destructors: RefCell<DefIdSet>,
250-
251248
/// Maps a DefId of a type to a list of its inherent impls.
252249
/// Contains implementations of methods that are inherent to a type.
253250
/// Methods in these implementations don't need to be exported.
@@ -475,7 +472,6 @@ impl<'tcx> ctxt<'tcx> {
475472
normalized_cache: RefCell::new(FnvHashMap()),
476473
lang_items: lang_items,
477474
provided_method_sources: RefCell::new(DefIdMap()),
478-
destructors: RefCell::new(DefIdSet()),
479475
inherent_impls: RefCell::new(DefIdMap()),
480476
impl_items: RefCell::new(DefIdMap()),
481477
used_unsafe: RefCell::new(NodeSet()),

src/librustc/middle/ty/mod.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,20 @@ impl<'tcx> Method<'tcx> {
272272
}
273273
}
274274

275+
impl<'tcx> PartialEq for Method<'tcx> {
276+
#[inline]
277+
fn eq(&self, other: &Self) -> bool { self.def_id == other.def_id }
278+
}
279+
280+
impl<'tcx> Eq for Method<'tcx> {}
281+
282+
impl<'tcx> Hash for Method<'tcx> {
283+
#[inline]
284+
fn hash<H: Hasher>(&self, s: &mut H) {
285+
self.def_id.hash(s)
286+
}
287+
}
288+
275289
#[derive(Clone, Copy, Debug)]
276290
pub struct AssociatedConst<'tcx> {
277291
pub name: Name,
@@ -1681,7 +1695,6 @@ impl<'tcx, 'container> AdtDefData<'tcx, 'container> {
16811695
}
16821696

16831697
pub fn set_destructor(&self, dtor: DefId) {
1684-
assert!(self.destructor.get().is_none());
16851698
self.destructor.set(Some(dtor));
16861699
}
16871700

@@ -2315,11 +2328,6 @@ impl<'tcx> ctxt<'tcx> {
23152328
self.lookup_adt_def_master(did)
23162329
}
23172330

2318-
/// Return the list of all interned ADT definitions
2319-
pub fn adt_defs(&self) -> Vec<AdtDef<'tcx>> {
2320-
self.adt_defs.borrow().values().cloned().collect()
2321-
}
2322-
23232331
/// Given the did of an item, returns its full set of predicates.
23242332
pub fn lookup_predicates(&self, did: DefId) -> GenericPredicates<'tcx> {
23252333
lookup_locally_or_in_crate_store(

src/librustc_front/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#![feature(staged_api)]
3737
#![feature(str_char)]
3838
#![feature(filling_drop)]
39-
#![cfg_attr(test, feature(test))]
4039

4140
extern crate serialize;
4241
#[macro_use] extern crate log;

src/librustc_lint/builtin.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,15 +1210,14 @@ impl LintPass for DropWithReprExtern {
12101210

12111211
impl LateLintPass for DropWithReprExtern {
12121212
fn check_crate(&mut self, ctx: &LateContext, _: &hir::Crate) {
1213-
for dtor_did in ctx.tcx.destructors.borrow().iter() {
1214-
let (drop_impl_did, dtor_self_type) =
1215-
if dtor_did.is_local() {
1216-
let impl_did = ctx.tcx.map.get_parent_did(dtor_did.node);
1217-
let ty = ctx.tcx.lookup_item_type(impl_did).ty;
1218-
(impl_did, ty)
1219-
} else {
1220-
continue;
1221-
};
1213+
let drop_trait = match ctx.tcx.lang_items.drop_trait() {
1214+
Some(id) => ctx.tcx.lookup_trait_def(id), None => { return }
1215+
};
1216+
drop_trait.for_each_impl(ctx.tcx, |drop_impl_did| {
1217+
if !drop_impl_did.is_local() {
1218+
return;
1219+
}
1220+
let dtor_self_type = ctx.tcx.lookup_item_type(drop_impl_did).ty;
12221221

12231222
match dtor_self_type.sty {
12241223
ty::TyEnum(self_type_def, _) |
@@ -1244,6 +1243,6 @@ impl LateLintPass for DropWithReprExtern {
12441243
}
12451244
_ => {}
12461245
}
1247-
}
1246+
})
12481247
}
12491248
}

src/librustc_trans/back/archive.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,13 @@ impl<'a> ArchiveBuilder<'a> {
145145

146146
/// Adds all of the contents of a native library to this archive. This will
147147
/// search in the relevant locations for a library named `name`.
148-
pub fn add_native_library(&mut self, name: &str) -> io::Result<()> {
148+
pub fn add_native_library(&mut self, name: &str) {
149149
let location = find_library(name, &self.config.lib_search_paths,
150150
self.config.sess);
151-
self.add_archive(&location, name, |_| false)
151+
self.add_archive(&location, name, |_| false).unwrap_or_else(|e| {
152+
self.config.sess.fatal(&format!("failed to add native library {}: {}",
153+
location.to_string_lossy(), e));
154+
});
152155
}
153156

154157
/// Adds all of the contents of the rlib at the specified path to this

src/librustc_trans/back/link.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ fn link_rlib<'a>(sess: &'a Session,
616616

617617
for &(ref l, kind) in sess.cstore.get_used_libraries().borrow().iter() {
618618
match kind {
619-
cstore::NativeStatic => ab.add_native_library(&l).unwrap(),
619+
cstore::NativeStatic => ab.add_native_library(&l),
620620
cstore::NativeFramework | cstore::NativeUnknown => {}
621621
}
622622
}
@@ -792,7 +792,7 @@ fn link_staticlib(sess: &Session, objects: &[PathBuf], out_filename: &Path,
792792
ab.build();
793793
}
794794
if !sess.target.target.options.no_compiler_rt {
795-
ab.add_native_library("compiler-rt").unwrap();
795+
ab.add_native_library("compiler-rt");
796796
}
797797

798798
let mut all_native_libs = vec![];

src/librustc_typeck/check/method/confirm.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -620,13 +620,7 @@ impl<'a,'tcx> ConfirmContext<'a,'tcx> {
620620
ty::TraitContainer(trait_def_id) => {
621621
callee::check_legal_trait_for_method_call(self.fcx.ccx, self.span, trait_def_id)
622622
}
623-
ty::ImplContainer(..) => {
624-
// Since `drop` is a trait method, we expect that any
625-
// potential calls to it will wind up in the other
626-
// arm. But just to be sure, check that the method id
627-
// does not appear in the list of destructors.
628-
assert!(!self.tcx().destructors.borrow().contains(&pick.item.def_id()));
629-
}
623+
ty::ImplContainer(..) => {}
630624
}
631625
}
632626

0 commit comments

Comments
 (0)