Merge pull request rust-lang#98 from gnzlbg/fix_b

Fix broken nightly build

Author: ibabushkin

Cargo.toml

@@ -5,7 +5,7 @@ repository = "https://github.com/rust-dev-tools/rust-semverver"
 readme = "README.md"
 keywords = ["semver", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
-version = "0.1.27"
+version = "0.1.28"
 authors = ["Inokentiy Babushkin <[email protected]>"]
 license-file = "LICENSE"
 edition = "2018"

src/bin/cargo_semver.rs

@@ -63,7 +63,9 @@ fn main() {
     }
 
     if matches.opt_present("q") {
-        config.shell().set_verbosity(cargo::core::shell::Verbosity::Quiet);
+        config
+            .shell()
+            .set_verbosity(cargo::core::shell::Verbosity::Quiet);
     }
 
     if let Err(e) = cli::validate_args(&matches) {
@@ -218,7 +220,11 @@ mod cli {
         opts.optflag("h", "help", "print this message and exit");
         opts.optflag("V", "version", "print version information and exit");
         opts.optflag("e", "explain", "print detailed error explanations");
-        opts.optflag("q", "quiet", "surpress regular cargo output, print only important messages");
+        opts.optflag(
+            "q",
+            "quiet",
+            "surpress regular cargo output, print only important messages",
+        );
         opts.optflag("d", "debug", "print command to debug and exit");
         opts.optflag(
             "a",
@@ -298,7 +304,9 @@ mod cli {
 
     /// Exit with error `e`.
     pub fn exit_with_error(config: &cargo::Config, e: failure::Error) -> ! {
-        config.shell().set_verbosity(cargo::core::shell::Verbosity::Normal);
+        config
+            .shell()
+            .set_verbosity(cargo::core::shell::Verbosity::Normal);
         cargo::exit_with_error(CliError::new(e, 1), &mut config.shell());
     }
 }

src/mapping.rs

@@ -334,9 +334,8 @@ impl NameMapping {
             Const(_) |
             ConstParam(_) |
             Static(_, _) |
-            StructCtor(_, _) |
+            Ctor(_, _, _) |
             SelfCtor(_) |
-            VariantCtor(_, _) |
             Method(_) |
             AssociatedConst(_) |
             Local(_) |

src/translate.rs

@@ -149,7 +149,7 @@ impl<'a, 'gcx, 'tcx> TranslationContext<'a, 'gcx, 'tcx> {
                             success.set(false);
                             self.tcx.mk_param_from_def(def)
                         }
-                    },
+                    }
                     GenericParamDefKind::Const => unreachable!(),
                 });
 

src/traverse.rs

@@ -19,13 +19,14 @@ use crate::{
 use log::{debug, info};
 use rustc::{
     hir::{
-        def::{CtorKind, Def, Export},
+        def::{CtorKind, CtorOf, Def, Export},
         def_id::DefId,
     },
     ty::{
         subst::{InternalSubsts, Subst},
         AssociatedItem, DefIdTree, GenericParamDef, GenericParamDefKind, Generics, Ty, TyCtxt,
-        Visibility, Visibility::Public,
+        Visibility,
+        Visibility::Public,
     },
 };
 use std::collections::{BTreeMap, HashSet, VecDeque};
@@ -146,7 +147,9 @@ fn diff_structure<'a, 'tcx>(
                         }
                     } else if id_mapping.add_export(o.def, n.def) {
                         // struct constructors are weird/hard - let's go shopping!
-                        if let (StructCtor(_, _), StructCtor(_, _)) = (o.def, n.def) {
+                        if let (Ctor(_, CtorOf::Struct, _), Ctor(_, CtorOf::Struct, _)) =
+                            (o.def, n.def)
+                        {
                             continue;
                         }
 
@@ -183,8 +186,8 @@ fn diff_structure<'a, 'tcx>(
                             | (PrimTy(_), PrimTy(_))
                             | (TyParam(_), TyParam(_))
                             | (SelfTy(_, _), SelfTy(_, _))
-                            | (StructCtor(_, _), StructCtor(_, _))
-                            | (VariantCtor(_, _), VariantCtor(_, _))
+                            | (Ctor(_, CtorOf::Struct, _), Ctor(_, CtorOf::Struct, _))
+                            | (Ctor(_, CtorOf::Variant, _), Ctor(_, CtorOf::Variant, _))
                             | (AssociatedConst(_), AssociatedConst(_))
                             | (Local(_), Local(_))
                             | (Upvar(_, _, _), Upvar(_, _, _))
@@ -254,7 +257,7 @@ fn diff_structure<'a, 'tcx>(
                 // only an old item is found
                 (Some(o), None) => {
                     // struct constructors are weird/hard - let's go shopping!
-                    if let StructCtor(_, _) = o.def {
+                    if let Ctor(_, CtorOf::Struct, _) = o.def {
                         continue;
                     }
 
@@ -266,7 +269,7 @@ fn diff_structure<'a, 'tcx>(
                 // only a new item is found
                 (None, Some(n)) => {
                     // struct constructors are weird/hard - let's go shopping!
-                    if let StructCtor(_, _) = n.def {
+                    if let Ctor(_, CtorOf::Struct, _) = n.def {
                         continue;
                     }
 
@@ -421,7 +424,7 @@ fn diff_adts(changes: &mut ChangeSet, id_mapping: &mut IdMapping, tcx: TyCtxt, o
                         now_struct: new.ctor_kind == CtorKind::Fictive,
                         total_private,
                     };
-                    changes.add_change(c, old_def_id, Some(tcx.def_span(new.did)));
+                    changes.add_change(c, old_def_id, Some(tcx.def_span(new.def_id)));
 
                     continue;
                 }
@@ -469,14 +472,14 @@ fn diff_adts(changes: &mut ChangeSet, id_mapping: &mut IdMapping, tcx: TyCtxt, o
                 changes.add_change(
                     ChangeType::VariantRemoved,
                     old_def_id,
-                    Some(tcx.def_span(old.did)),
+                    Some(tcx.def_span(old.def_id)),
                 );
             }
             (None, Some(new)) => {
                 changes.add_change(
                     ChangeType::VariantAdded,
                     old_def_id,
-                    Some(tcx.def_span(new.did)),
+                    Some(tcx.def_span(new.def_id)),
                 );
             }
             (None, None) => unreachable!(),

src/typeck.rs

@@ -195,7 +195,7 @@ impl<'a, 'gcx, 'tcx> TypeComparisonContext<'a, 'gcx, 'tcx> {
                 } else {
                     self.infcx.tcx.mk_param_from_def(def)
                 }
-            },
+            }
             GenericParamDefKind::Const => unreachable!(),
         })
     }

tests/full.rs

@@ -22,9 +22,11 @@ mod full {
 
         let mut cmd = Command::new("./target/debug/cargo-semver");
         cmd.args(&[
-            "-S", &format!("{}:{}", crate_name, old_version),
-            "-C", &format!("{}:{}", crate_name, new_version),
-            "-q"
+            "-S",
+            &format!("{}:{}", crate_name, old_version),
+            "-C",
+            &format!("{}:{}", crate_name, new_version),
+            "-q",
         ])
         .env("RUST_BACKTRACE", "full")
         .stdin(Stdio::null())
@@ -37,8 +39,11 @@ mod full {
 
         let output = cmd.output().expect("could not run cargo semver");
 
-        assert_eq!(output.status.success(), expected_result,
-            "cargo-semver returned unexpected exit status {}", output.status
+        assert_eq!(
+            output.status.success(),
+            expected_result,
+            "cargo-semver returned unexpected exit status {}",
+            output.status
         );
 
         // Choose solution depending on the platform
@@ -58,11 +63,17 @@ mod full {
             crate_name, old_version, new_version, file_ext
         ));
 
-        assert!(filename.exists(), "file `{}` does not exist", filename.display());
+        assert!(
+            filename.exists(),
+            "file `{}` does not exist",
+            filename.display()
+        );
 
         let mut file = File::create(&filename).expect("could not create output file");
 
-        for line in output.stdout.lines()
+        for line in output
+            .stdout
+            .lines()
             .chain(output.stderr.lines())
             .map(|r| r.expect("could not read line from cargo-semver output"))
             .skip_while(|line|
@@ -86,7 +97,12 @@ mod full {
         }
 
         let git_result = Command::new("git")
-            .args(&["diff", "--ignore-space-at-eol", "--exit-code", filename.to_str().unwrap()])
+            .args(&[
+                "diff",
+                "--ignore-space-at-eol",
+                "--exit-code",
+                filename.to_str().unwrap(),
+            ])
             .env("PAGER", "")
             .status()
             .expect("could not run git diff")