Rustup to latest nightly

Author: JohnTitor

.travis.yml

@@ -28,7 +28,7 @@ matrix:
         fi
     - name: "clippy"
       script: |
-        if rustup component add clippy-preview; then
+        if rustup component add clippy-preview rustc-dev; then
             cargo clippy --all -- -D clippy::pedantic
         fi
     - name: "Shellcheck"

Cargo.toml

@@ -27,16 +27,15 @@ name = "rust-semver-public"
 path = "src/bin/rust_semver_public.rs"
 
 [dependencies]
-cargo = "0.39"
-crates-io = "0.27"
+cargo = "0.42"
+crates-io = "0.30"
 curl = "0.4.21"
 env_logger = "0.7"
 failure = "0.1"
 log = "0.4"
 rand = "0.7"
 semver = "0.9"
-serde = "1.0.84"
-serde_derive = "1.0.84"
+serde = { version = "1.0.84", features = ["derive"] }
 serde_json = "1.0.34"
 
 [dev-dependencies]

src/bin/cargo_semver.rs

@@ -4,9 +4,8 @@
 
 extern crate curl;
 extern crate getopts;
-extern crate serde;
 #[macro_use]
-extern crate serde_derive;
+extern crate serde;
 extern crate serde_json;
 
 use cargo::core::{Package, PackageId, Source, SourceId, Workspace};
@@ -483,7 +482,11 @@ impl<'a> WorkInfo<'a> {
         opts.build_config.build_plan = true;
 
         if let Some(target) = matches.opt_str("target") {
-            opts.build_config.requested_target = Some(target);
+            let target = cargo::core::compiler::CompileTarget::new(&target);
+            if let Ok(target) = target {
+                let kind = cargo::core::compiler::CompileKind::Target(target);
+                opts.build_config.requested_kind = kind;
+            }
         }
 
         if let Some(s) = matches.opt_str("features") {

src/bin/rust_semver_public.rs

@@ -1,20 +1,19 @@
 #![feature(rustc_private)]
-#![feature(result_map_or_else)]
 
-extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_interface;
-extern crate syntax;
+extern crate rustc_middle;
+extern crate rustc_span;
 
 use log::debug;
 use rustc_driver::{Callbacks, Compilation};
-use rustc_interface::interface;
+use rustc_interface::{interface, Queries};
+use rustc_span::source_map::Pos;
 use semverver::run_traversal;
 use std::{
     path::Path,
     process::{exit, Command},
 };
-use syntax::source_map::Pos;
 
 /// Display semverver version.
 fn show_version() {
@@ -36,10 +35,10 @@ fn main() {
             struct PubCallbacks;
 
             impl Callbacks for PubCallbacks {
-                fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation {
+                fn after_analysis<'tcx>(&mut self, _compiler: &interface::Compiler, queries: &'tcx Queries<'tcx>) -> Compilation {
                     debug!("running rust-semver-public after_analysis callback");
 
-                    compiler.global_ctxt().unwrap().peek_mut().enter(|tcx| {
+                    queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
                         let krate = tcx
                             .crates()
                             .iter()

src/bin/rust_semverver.rs

@@ -1,23 +1,21 @@
 #![feature(rustc_private)]
-#![feature(result_map_or_else)]
 
-extern crate rustc;
-extern crate rustc_codegen_utils;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_interface;
 extern crate rustc_metadata;
-extern crate syntax;
+extern crate rustc_middle;
+extern crate rustc_span;
 
 use log::debug;
 use rustc_driver::{Callbacks, Compilation};
-use rustc_interface::interface;
+use rustc_interface::{interface, Queries};
+use rustc_span::source_map::Pos;
 use semverver::run_analysis;
 use std::{
     path::Path,
     process::{exit, Command},
 };
-use syntax::source_map::Pos;
 
 /// Display semverver version.
 fn show_version() {
@@ -38,7 +36,7 @@ fn main() {
             struct SemverCallbacks;
 
             impl Callbacks for SemverCallbacks {
-                fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation {
+                fn after_analysis<'tcx>(&mut self, _compiler: &interface::Compiler, queries: &'tcx Queries<'tcx>) -> Compilation {
                     debug!("running rust-semverver after_analysis callback");
 
                     let verbose =
@@ -55,7 +53,7 @@ fn main() {
                         "no_version".to_owned()
                     };
 
-                    compiler.global_ctxt().unwrap().peek_mut().enter(|tcx| {
+                    queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
                         // To select the old and new crates we look at the position of the
                         // declaration in the source file. The first one will be the `old`
                         // and the other will be `new`. This is unfortunately a bit hacky...

src/changes.rs

@@ -9,19 +9,17 @@
 //! complicated by the fact that we still group changes by the item they refer to, even if it's
 //! path changes.
 
-use rustc::{
-    hir::def_id::DefId,
-    session::Session,
-    ty::{error::TypeError, Predicate},
-};
+use rustc_hir::def_id::DefId;
+use rustc_middle::ty::{error::TypeError, Predicate};
+use rustc_session::Session;
+use rustc_span::symbol::Symbol;
+use rustc_span::{FileName, Span};
 use semver::Version;
 use std::{
     cmp::Ordering,
     collections::{BTreeMap, BTreeSet, HashMap},
     fmt,
 };
-use syntax::symbol::Symbol;
-use syntax_pos::{FileName, Span};
 
 use serde::ser::{SerializeSeq, SerializeStruct, Serializer};
 use serde::Serialize;
@@ -306,11 +304,19 @@ pub enum ChangeType<'tcx> {
     /// A possibly public field has been added to a variant or struct.
     ///
     /// This also records whether all fields are public were public before the change.
-    VariantFieldAdded { public: bool, total_public: bool, is_enum: bool },
+    VariantFieldAdded {
+        public: bool,
+        total_public: bool,
+        is_enum: bool,
+    },
     /// A possibly public field has been removed from a variant or struct.
     ///
     /// This also records whether all fields were public before the change.
-    VariantFieldRemoved { public: bool, total_public: bool, is_enum: bool },
+    VariantFieldRemoved {
+        public: bool,
+        total_public: bool,
+        is_enum: bool,
+    },
     /// A variant or struct has changed it's style.
     ///
     /// The style could have been changed from a tuple variant/struct to a regular
@@ -671,7 +677,7 @@ impl<'a> fmt::Display for ChangeType<'a> {
             VariantFieldRemoved {
                 public: true,
                 total_public: false,
-                is_enum: true
+                is_enum: true,
             } => "public field removed from variant with private fields",
             VariantFieldRemoved {
                 public: true,
@@ -1219,13 +1225,13 @@ pub mod tests {
     extern crate quickcheck;
     use quickcheck::*;
 
-    use rustc::hir::def_id::DefId;
+    use rustc_hir::def_id::DefId;
 
     use std::cmp::{max, min};
 
-    use syntax_pos::hygiene::SyntaxContext;
-    use syntax_pos::symbol::Interner;
-    use syntax_pos::BytePos;
+    use rustc_span::hygiene::SyntaxContext;
+    use rustc_span::symbol::Interner;
+    use rustc_span::BytePos;
 
     /// A wrapper for `Span` that can be randomly generated.
     #[derive(Clone, Debug)]
@@ -1257,7 +1263,7 @@ pub mod tests {
 
     impl Arbitrary for DefId_ {
         fn arbitrary<G: Gen>(g: &mut G) -> DefId_ {
-            use rustc::hir::def_id::{CrateNum, DefIndex};
+            use rustc_hir::def_id::{CrateNum, DefIndex};
 
             let a: u32 = Arbitrary::arbitrary(g);
             let b: u32 = Arbitrary::arbitrary(g);

src/lib.rs

@@ -3,9 +3,15 @@
 #![allow(clippy::single_match_else)]
 #![allow(clippy::too_many_lines)]
 #![deny(warnings)]
-extern crate rustc;
-extern crate syntax;
-extern crate syntax_pos;
+extern crate rustc_ast;
+extern crate rustc_hir;
+extern crate rustc_infer;
+extern crate rustc_middle;
+extern crate rustc_mir;
+extern crate rustc_session;
+extern crate rustc_span;
+extern crate rustc_trait_selection;
+extern crate rustc_traits;
 
 mod changes;
 mod mapping;

src/mapping.rs

@@ -3,17 +3,18 @@
 //! This module provides facilities to record item correspondence of various kinds, as well as a
 //! map used to temporarily match up unsorted item sequences' elements by name.
 
-use rustc::{
-    hir::{
-        def::{Export, Res},
-        def_id::{CrateNum, DefId},
-        HirId,
-    },
+use rustc_ast::ast::Name;
+use rustc_hir::{
+    def::Res,
+    def_id::{CrateNum, DefId},
+    HirId,
+};
+use rustc_middle::{
+    hir::exports::Export,
     ty::{AssocKind, GenericParamDef, GenericParamDefKind},
 };
 use std::collections::{BTreeSet, HashMap, HashSet, VecDeque};
 use std::hash::{Hash, Hasher};
-use syntax::ast::Name;
 
 /// A description of an item found in an inherent impl.
 #[derive(Debug, PartialEq)]
@@ -40,6 +41,7 @@ fn assert_inherent_entry_members_impl_eq() {
     assert_impl_eq::<Name>();
 }
 
+#[allow(clippy::derive_hash_xor_eq)]
 impl Hash for InherentEntry {
     fn hash<H: Hasher>(&self, hasher: &mut H) {
         self.parent_def_id.hash(hasher);
@@ -111,14 +113,19 @@ impl IdMapping {
 
     /// Register two exports representing the same item across versions.
     pub fn add_export(&mut self, old: Res, new: Res) -> bool {
-        let old_def_id = old.def_id();
+        let (old_def_id, new_def_id) =
+            if let (Some(old_def_id), Some(new_def_id)) = (old.opt_def_id(), new.opt_def_id()) {
+                (old_def_id, new_def_id)
+            } else {
+                return false;
+            };
 
         if !self.in_old_crate(old_def_id) || self.toplevel_mapping.contains_key(&old_def_id) {
             return false;
         }
 
         self.toplevel_mapping.insert(old_def_id, (old, new));
-        self.reverse_mapping.insert(new.def_id(), old_def_id);
+        self.reverse_mapping.insert(new_def_id, old_def_id);
 
         true
     }
@@ -343,8 +350,8 @@ pub struct NameMapping {
 impl NameMapping {
     /// Insert a single export in the appropriate map, at the appropriate position.
     fn insert(&mut self, item: Export<HirId>, old: bool) {
-        use rustc::hir::def::DefKind::*;
-        use rustc::hir::def::Res::*;
+        use rustc_hir::def::DefKind::*;
+        use rustc_hir::def::Res::*;
 
         let map = match item.res {
             Def(kind, _) => match kind {
@@ -366,7 +373,7 @@ impl NameMapping {
                 ConstParam |
                 Static |
                 Ctor(_, _) |
-                Method |
+                AssocFn |
                 AssocConst => Some(&mut self.value_map),
                 Macro(_) => Some(&mut self.macro_map),
             },

src/mismatch.rs

@@ -6,15 +6,13 @@
 
 use crate::mapping::IdMapping;
 use log::debug;
-use rustc::{
-    hir::def::{DefKind, Res},
-    ty::{
-        self,
-        relate::{Relate, RelateResult, TypeRelation},
-        subst::SubstsRef,
-        ParamEnv, Ty, TyCtxt,
-        Visibility::Public,
-    },
+use rustc_hir::def::{DefKind, Res};
+use rustc_middle::ty::{
+    self,
+    relate::{Relate, RelateResult, TypeRelation},
+    subst::SubstsRef,
+    ParamEnv, Ty, TyCtxt,
+    Visibility::Public,
 };
 use std::collections::{HashMap, HashSet, VecDeque};
 
@@ -51,7 +49,7 @@ impl<'a, 'tcx> MismatchRelation<'a, 'tcx> {
 
     /// Process the next pair of `DefId`s in the queue.
     pub fn process(&mut self) {
-        // use rustc::hir::def::DefKind::*;
+        // use rustc_middle::hir::def::DefKind::*;
 
         while let Some((old_res, new_res)) = self.item_queue.pop_front() {
             debug!(
@@ -87,7 +85,7 @@ impl<'a, 'tcx> MismatchRelation<'a, 'tcx> {
 
     /// Ensure that the pair of given `SubstsRef`s is suitable to be related.
     fn check_substs(&self, a_substs: SubstsRef<'tcx>, b_substs: SubstsRef<'tcx>) -> bool {
-        use rustc::ty::subst::GenericArgKind::*;
+        use rustc_middle::ty::subst::GenericArgKind::*;
 
         for (a, b) in a_substs.iter().zip(b_substs) {
             match (a.unpack(), b.unpack()) {
@@ -132,7 +130,7 @@ impl<'a, 'tcx> TypeRelation<'tcx> for MismatchRelation<'a, 'tcx> {
     }
 
     fn tys(&mut self, a: Ty<'tcx>, b: Ty<'tcx>) -> RelateResult<'tcx, Ty<'tcx>> {
-        use rustc::ty::TyKind;
+        use rustc_middle::ty::TyKind;
 
         if self.current_old_types.contains(a) || self.current_new_types.contains(b) {
             return Ok(self.tcx.types.err);