From c9f2dbeca63b06eac43884aa7d04a08f492004ec Mon Sep 17 00:00:00 2001
From: Igor Matuszewski <xanewok@gmail.com>
Date: Tue, 17 Nov 2020 19:46:14 +0100
Subject: [PATCH] Fix breakage due to rust-lang/rust#77649

See https://github.com/rust-lang/rust/pull/77649
---
 rust-toolchain                | 2 +-
 src/bin/rust-semver-public.rs | 5 ++---
 src/bin/rust-semverver.rs     | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/rust-toolchain b/rust-toolchain
index 9393e6a7..ab4c3c84 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-09-30
+nightly-2020-10-15
diff --git a/src/bin/rust-semver-public.rs b/src/bin/rust-semver-public.rs
index 7e981c39..8fe1dd2a 100644
--- a/src/bin/rust-semver-public.rs
+++ b/src/bin/rust-semver-public.rs
@@ -5,7 +5,7 @@ extern crate rustc_interface;
 extern crate rustc_span;
 
 use log::debug;
-use rustc_driver::{Callbacks, Compilation};
+use rustc_driver::{Callbacks, Compilation, RunCompiler};
 use rustc_interface::{interface, Queries};
 use rustc_span::source_map::Pos;
 use semverver::run_traversal;
@@ -114,8 +114,7 @@ fn main() {
                     .collect()
             };
 
-            let args = args;
-            rustc_driver::run_compiler(&args, &mut PubCallbacks, None, None, None)
+            RunCompiler::new(&args, &mut PubCallbacks).run()
         }
         .map_or_else(|_| 1, |_| 0),
     )
diff --git a/src/bin/rust-semverver.rs b/src/bin/rust-semverver.rs
index fb84e478..559c9e2c 100644
--- a/src/bin/rust-semverver.rs
+++ b/src/bin/rust-semverver.rs
@@ -5,7 +5,7 @@ extern crate rustc_interface;
 extern crate rustc_span;
 
 use log::debug;
-use rustc_driver::{Callbacks, Compilation};
+use rustc_driver::{Callbacks, Compilation, RunCompiler};
 use rustc_interface::{interface, Queries};
 use rustc_span::source_map::Pos;
 use semverver::run_analysis;
@@ -140,8 +140,7 @@ fn main() {
                     .collect()
             };
 
-            let args = args;
-            rustc_driver::run_compiler(&args, &mut SemverCallbacks, None, None, None)
+            RunCompiler::new(&args, &mut SemverCallbacks).run()
         }
         .map_or_else(|_| 1, |_| 0),
     )