Auto merge of #203 - JohnTitor:nightly-bump, r=Xanewok

Rustup to nightly-2021-07-23

r? `@Xanewok`

README.md

@@ -27,13 +27,13 @@ repository and compiled from source or installed from
 of the nightly toolchain is supported at any given time.
 
 <!-- NOTE: Keep in sync with nightly date on rust-toolchain. -->
-It's recommended to use `nightly-2021-06-14` toolchain.
-You can install it by using `rustup install nightly-2021-06-14` if you already have rustup.
+It's recommended to use `nightly-2021-07-23` toolchain.
+You can install it by using `rustup install nightly-2021-07-23` if you already have rustup.
 Then you can do:
 
 ```sh
-$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-06-14
-$ cargo +nightly-2021-06-14 install --git https://github.com/rust-lang/rust-semverver
+$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2021-07-23
+$ cargo +nightly-2021-07-23 install --git https://github.com/rust-lang/rust-semverver
 ```
 
 You'd also need `cmake` for some dependencies, and a few common libraries (if you hit

rust-toolchain

@@ -1,4 +1,4 @@
 # NOTE: Keep in sync with nightly date on README
 [toolchain]
-channel = "nightly-2021-06-14"
+channel = "nightly-2021-07-23"
 components = ["llvm-tools-preview", "rustc-dev"]

src/bin/cargo-semver.rs

@@ -496,7 +496,7 @@ impl<'a> WorkInfo<'a> {
             opts.cli_features.features = Rc::new(
                 s.split(' ')
                     .map(InternedString::new)
-                    .map(|f| FeatureValue::new(f))
+                    .map(FeatureValue::new)
                     .collect(),
             );
         }

src/bin/rust-semver-public.rs

@@ -39,7 +39,7 @@ fn main() {
 
                     queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
                         let krate = tcx
-                            .crates()
+                            .crates(())
                             .iter()
                             .flat_map(|crate_num| {
                                 let def_id = crate_num.as_def_id();

src/bin/rust-semverver.rs

@@ -57,7 +57,7 @@ fn main() {
                         // See issue #64 for details.
 
                         let mut crates: Vec<_> = tcx
-                            .crates()
+                            .crates(())
                             .iter()
                             .flat_map(|crate_num| {
                                 let def_id = crate_num.as_def_id();

src/changes.rs

@@ -1488,7 +1488,7 @@ pub mod tests {
     quickcheck! {
         /// The `Ord` instance of `PathChange` is transitive.
         fn ord_pchange_transitive(c1: PathChange_, c2: PathChange_, c3: PathChange_) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let s1 = c1.2.iter().map(|&(add, ref s)| (add, s.clone().inner())).collect();
             let s2 = c2.2.iter().map(|&(add, ref s)| (add, s.clone().inner())).collect();
             let s3 = c3.2.iter().map(|&(add, ref s)| (add, s.clone().inner())).collect();
@@ -1517,7 +1517,7 @@ pub mod tests {
 
         /// The `Ord` instance of `Change` is transitive.
         fn ord_change_transitive(c1: Change_, c2: Change_, c3: Change_) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let ch1 = build_change(c1.3.inner(), c1.4, c1.5);
             let ch2 = build_change(c2.3.inner(), c2.4, c2.5);
             let ch3 = build_change(c3.3.inner(), c3.4, c3.5);
@@ -1543,7 +1543,7 @@ pub mod tests {
         /// The maximal change category for a change set with regular changes only gets computed
         /// correctly.
         fn max_pchange(changes: Vec<PathChange_>) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let mut set = ChangeSet::default();
 
             let mut interner = Interner::default();
@@ -1576,7 +1576,7 @@ pub mod tests {
         /// The maximal change category for a change set with path changes only gets computed
         /// correctly.
         fn max_change(changes: Vec<Change_>) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let mut set = ChangeSet::default();
 
             let mut interner = Interner::default();
@@ -1611,7 +1611,7 @@ pub mod tests {
         }
 
         fn max_pchange_or_change(pchanges: Vec<PathChange_>, changes: Vec<Change_>) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let mut set = ChangeSet::default();
 
             let mut interner = Interner::default();
@@ -1664,7 +1664,7 @@ pub mod tests {
 
         /// Difference in spans implies difference in `PathChange`s.
         fn pchange_span_neq(c1: PathChange_, c2: PathChange_) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let v1 = c1.2.iter().map(|&(add, ref s)| (add, s.clone().inner())).collect();
             let v2 = c2.2.iter().map(|&(add, ref s)| (add, s.clone().inner())).collect();
 
@@ -1684,7 +1684,7 @@ pub mod tests {
 
         /// Difference in spans implies difference in `Change`s.
         fn bchange_span_neq(c1: Change_, c2: Change_) -> bool {
-            rustc_span::with_default_session_globals(|| {
+            rustc_span::create_default_session_globals_then(|| {
             let s1 = c1.3.clone().inner();
             let s2 = c2.3.clone().inner();