---

yaml
---
r: 180147
b: refs/heads/tmp
c: d6c158d
h: refs/heads/master
i:
  180145: f20a093
  180143: 612ec6d
v: v3

Author: pnkfelix

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: f51176df0182f37b71a0f6397ecde590efe4a757
+refs/heads/tmp: d6c158d262e2783018854ac885cb6af0268dab88

branches/tmp/src/librustc_typeck/check/dropck.rs

@@ -170,43 +170,6 @@ fn iterate_over_potentially_unsafe_regions_in_type<'a, 'tcx>(
                 result
             });
 
-            let has_type_param_of_interest = dtor_generics.types.iter().any(|t| {
-                let &ty::ParamBounds {
-                    ref region_bounds, builtin_bounds, ref trait_bounds,
-                    ref projection_bounds,
-                } = &t.bounds;
-
-                // Belt-and-suspenders: The current set of builtin
-                // bounds {Send, Sized, Copy, Sync} do not introduce
-                // any new capability to access borrowed data hidden
-                // behind a type parameter.
-                //
-                // In case new builtin bounds get added that do not
-                // satisfy that property, ensure `builtin_bounds \
-                // {Send,Sized,Copy,Sync}` is empty.
-
-                let mut builtin_bounds = builtin_bounds;
-                builtin_bounds.remove(&ty::BoundSend);
-                builtin_bounds.remove(&ty::BoundSized);
-                builtin_bounds.remove(&ty::BoundCopy);
-                builtin_bounds.remove(&ty::BoundSync);
-
-                let has_bounds =
-                    !region_bounds.is_empty() ||
-                    !builtin_bounds.is_empty() ||
-                    !trait_bounds.is_empty() ||
-                    !projection_bounds.is_empty();
-
-                if has_bounds {
-                    debug!("typ: {} has interesting dtor due to \
-                            bounds on param {}",
-                           typ.repr(rcx.tcx()), t.name);
-                }
-
-                has_bounds
-
-            });
-
             // In `impl<'a> Drop ...`, we automatically assume
             // `'a` is meaningful and thus represents a bound
             // through which we could reach borrowed data.
@@ -220,15 +183,13 @@ fn iterate_over_potentially_unsafe_regions_in_type<'a, 'tcx>(
 
             has_dtor_of_interest =
                 has_region_param_of_interest ||
-                has_type_param_of_interest ||
                 has_pred_of_interest;
 
             if has_dtor_of_interest {
                 debug!("typ: {} has interesting dtor, due to \
-                        region params: {} type params: {} or pred: {}",
+                        region params: {} or pred: {}",
                        typ.repr(rcx.tcx()),
                        has_region_param_of_interest,
-                       has_type_param_of_interest,
                        has_pred_of_interest);
             } else {
                 debug!("typ: {} has dtor, but it is uninteresting",