Merge pull request #116 from JohnTitor/rustup

Rustup to the latest nightly

Author: Manishearth

.travis.yml

@@ -15,7 +15,7 @@ matrix:
       env: RUST_BACKTRACE=full
     - name: "osx"
       os: osx
-      osx_image: xcode10
+      osx_image: xcode11.3
       env: RUST_BACKTRACE=full
     - name: "windows"
       os: windows
@@ -29,7 +29,7 @@ matrix:
     - name: "clippy"
       script: |
         if rustup component add clippy-preview rustc-dev; then
-            cargo clippy --all -- -D clippy::pedantic
+            cargo clippy --all
         fi
     - name: "Shellcheck"
       script:

ci/run.sh

@@ -20,6 +20,7 @@ case "${TRAVIS_OS_NAME}" in
         TEST_TARGET=x86_64-unknown-linux-gnu cargo test --verbose -- --nocapture
         ;;
     *"windows"*)
+        rustup target add x86_64-pc-windows-msvc
         TEST_TARGET=x86_64-pc-windows-msvc cargo test --verbose -- --nocapture
         ;;
     *"macos"*)

src/bin/cargo_semver.rs

@@ -3,16 +3,17 @@
 #![allow(clippy::too_many_lines)]
 
 extern crate curl;
-extern crate getopts;
 #[macro_use]
 extern crate serde;
+extern crate rustc_session;
 extern crate serde_json;
 
 use cargo::core::{Package, PackageId, Source, SourceId, Workspace};
 use cargo::sources::RegistrySource;
 use curl::easy::Easy;
 use log::debug;
 use rand::Rng;
+use rustc_session::getopts;
 use std::collections::HashSet;
 use std::{
     env,
@@ -268,8 +269,8 @@ fn run(config: &cargo::Config, matches: &getopts::Matches) -> Result<()> {
 
 /// CLI utils
 mod cli {
-    extern crate getopts;
     use cargo::util::CliError;
+    use rustc_session::getopts;
 
     /// CLI options
     pub fn options() -> getopts::Options {

src/mapping.rs

@@ -48,10 +48,10 @@ impl Hash for InherentEntry {
 
         // FIXME derive Hash again once AssocKind derives Hash again.
         match self.kind {
-            AssocKind::Const => 0u8.hash(hasher),
-            AssocKind::Method => 1u8.hash(hasher),
-            AssocKind::OpaqueTy => 2u8.hash(hasher),
-            AssocKind::Type => 3u8.hash(hasher),
+            AssocKind::Const => 0_u8.hash(hasher),
+            AssocKind::Fn => 1_u8.hash(hasher),
+            AssocKind::OpaqueTy => 2_u8.hash(hasher),
+            AssocKind::Type => 3_u8.hash(hasher),
         }
 
         self.name.hash(hasher);

src/mismatch.rs

@@ -129,6 +129,8 @@ impl<'a, 'tcx> TypeRelation<'tcx> for MismatchRelation<'a, 'tcx> {
         Relate::relate(self, a, b)
     }
 
+    // Allow this since that lint is too pedantic here.
+    #[allow(clippy::similar_names)]
     fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
         use rustc_middle::ty::TyKind;
 

src/traverse.rs

@@ -377,10 +377,10 @@ fn diff_fn<'tcx>(changes: &mut ChangeSet, tcx: TyCtxt<'tcx>, old: Res, new: Res)
 
 /// Given two method items, perform structural checks.
 fn diff_method<'tcx>(changes: &mut ChangeSet, tcx: TyCtxt<'tcx>, old: AssocItem, new: AssocItem) {
-    if old.method_has_self_argument != new.method_has_self_argument {
+    if old.fn_has_self_parameter != new.fn_has_self_parameter {
         changes.add_change(
             ChangeType::MethodSelfChanged {
-                now_self: new.method_has_self_argument,
+                now_self: new.fn_has_self_parameter,
             },
             old.def_id,
             None,
@@ -628,8 +628,8 @@ fn diff_traits<'tcx>(
             (Some(old_item), Some(new_item)) => {
                 let old_def_id = old_item.def_id;
                 let new_def_id = new_item.def_id;
-                let old_res = Res::Def(old_item.def_kind(), old_def_id);
-                let new_res = Res::Def(new_item.def_kind(), new_def_id);
+                let old_res = Res::Def(old_item.kind.as_def_kind(), old_def_id);
+                let new_res = Res::Def(new_item.kind.as_def_kind(), new_def_id);
 
                 id_mapping.add_trait_item(old_res, new_res, old);
                 changes.new_change(
@@ -1127,7 +1127,8 @@ fn is_impl_trait_public<'tcx>(tcx: TyCtxt<'tcx>, impl_def_id: DefId) -> bool {
 
     // Check if all input types of the trait implementation are public (including `Self`).
     let is_public = trait_ref
-        .input_types()
+        .substs
+        .types()
         .map(|t| type_visibility(tcx, t))
         .all(|v| v == Visibility::Public);
 
@@ -1275,7 +1276,7 @@ fn match_inherent_impl<'tcx>(
                 infcx.tcx.type_of(orig_item_def_id),
                 infcx.tcx.type_of(target_item_def_id),
             ),
-            (AssocKind::Method, AssocKind::Method) => {
+            (AssocKind::Fn, AssocKind::Fn) => {
                 diff_method(changes, tcx, orig_item, target_item);
                 let orig_sig = infcx.tcx.type_of(orig_item_def_id).fn_sig(tcx);
                 let target_sig = infcx.tcx.type_of(target_item_def_id).fn_sig(tcx);

tests/cases/addition/stdout

@@ -54,3 +54,5 @@ warning: path changes to `Cde`
    |
    = note: added definition (technically breaking)
 
+warning: 6 warnings emitted
+

tests/cases/addition_path/stdout

@@ -30,3 +30,6 @@ warning: path changes to `d`
    | |_^
    |
    = note: added definition (technically breaking)
+
+warning: 2 warnings emitted
+

tests/cases/addition_use/stdout

@@ -27,5 +27,5 @@ warning: path changes to `Bcd`
   |
   = note: added definition (technically breaking)
 
-error: aborting due to previous error
+error: aborting due to previous error; 2 warnings emitted
 

tests/cases/bounds/stdout

@@ -35,5 +35,5 @@ warning: technically breaking changes in `def`
    |
    = note: removed bound: `A: std::clone::Clone` (technically breaking)
 
-error: aborting due to 2 previous errors
+error: aborting due to 2 previous errors; 2 warnings emitted