From cca6e015c9b77bea111c6c6bf7ac7f51802c847d Mon Sep 17 00:00:00 2001
From: Yuki Okushi <jtitor@2k36.org>
Date: Wed, 20 Jul 2022 19:38:17 +0900
Subject: [PATCH] Rustup to rust-lang/rust#98320

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
---
 README.md                                          | 10 +++++-----
 rust-toolchain                                     |  2 +-
 tests/full_cases/config-0.13.0-0.13.1.linux        |  4 ++--
 tests/full_cases/config-0.13.0-0.13.1.osx          |  4 ++--
 tests/full_cases/config-0.13.0-0.13.1.windows_msvc |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 977655ae..644fe8aa 100644
--- a/README.md
+++ b/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-2022-07-16` toolchain.
-You can install it by using `rustup install nightly-2022-07-16` if you already have rustup.
+It's recommended to use `nightly-2022-07-20` toolchain.
+You can install it by using `rustup install nightly-2022-07-20` if you already have rustup.
 Then you can do:
 
 ```sh
-$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-07-16
-$ cargo +nightly-2022-07-16 install --git https://github.com/rust-lang/rust-semverver
+$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-07-20
+$ cargo +nightly-2022-07-20 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
@@ -122,7 +122,7 @@ carried out correctly with regards to the current version of your crate on crate
 
 ```sh
 # install a current version of rust-semverver
-cargo +nightly-2022-07-16 install --git https://github.com/rust-lang/rust-semverver
+cargo +nightly-2022-07-20 install --git https://github.com/rust-lang/rust-semverver
 # fetch the version in the manifest of your crate (adapt this to your usecase if needed)
 eval "current_version=$(grep -e '^version = .*$' Cargo.toml | cut -d ' ' -f 3)"
 # run the semver checks and output them for convenience
diff --git a/rust-toolchain b/rust-toolchain
index 1cf019c2..c4d6894d 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,4 +1,4 @@
 # NOTE: Keep in sync with nightly date on README
 [toolchain]
-channel = "nightly-2022-07-16"
+channel = "nightly-2022-07-20"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/tests/full_cases/config-0.13.0-0.13.1.linux b/tests/full_cases/config-0.13.0-0.13.1.linux
index d7e49102..18ad61bb 100644
--- a/tests/full_cases/config-0.13.0-0.13.1.linux
+++ b/tests/full_cases/config-0.13.0-0.13.1.linux
@@ -451,7 +451,7 @@ error: breaking changes in `<old::file::format::ALL_EXTENSIONS as lazy_static::L
    | |_^
    |
    = warning: trait impl specialized or removed (breaking)
-   = note: this error originates in the macro `__lazy_static_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `__lazy_static_internal` which comes from the expansion of the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: technically breaking changes in `<new::file::format::ALL_EXTENSIONS as lazy_static::LazyStatic>`
   --> config-0.13.1/src/file/format/mod.rs:60:1
@@ -466,7 +466,7 @@ warning: technically breaking changes in `<new::file::format::ALL_EXTENSIONS as
    | |_^
    |
    = note: trait impl generalized or newly added (technically breaking)
-   = note: this warning originates in the macro `__lazy_static_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this warning originates in the macro `__lazy_static_internal` which comes from the expansion of the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 33 previous errors; 23 warnings emitted
 
diff --git a/tests/full_cases/config-0.13.0-0.13.1.osx b/tests/full_cases/config-0.13.0-0.13.1.osx
index d7e49102..18ad61bb 100644
--- a/tests/full_cases/config-0.13.0-0.13.1.osx
+++ b/tests/full_cases/config-0.13.0-0.13.1.osx
@@ -451,7 +451,7 @@ error: breaking changes in `<old::file::format::ALL_EXTENSIONS as lazy_static::L
    | |_^
    |
    = warning: trait impl specialized or removed (breaking)
-   = note: this error originates in the macro `__lazy_static_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `__lazy_static_internal` which comes from the expansion of the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: technically breaking changes in `<new::file::format::ALL_EXTENSIONS as lazy_static::LazyStatic>`
   --> config-0.13.1/src/file/format/mod.rs:60:1
@@ -466,7 +466,7 @@ warning: technically breaking changes in `<new::file::format::ALL_EXTENSIONS as
    | |_^
    |
    = note: trait impl generalized or newly added (technically breaking)
-   = note: this warning originates in the macro `__lazy_static_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this warning originates in the macro `__lazy_static_internal` which comes from the expansion of the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 33 previous errors; 23 warnings emitted
 
diff --git a/tests/full_cases/config-0.13.0-0.13.1.windows_msvc b/tests/full_cases/config-0.13.0-0.13.1.windows_msvc
index e36f3122..be85648a 100644
--- a/tests/full_cases/config-0.13.0-0.13.1.windows_msvc
+++ b/tests/full_cases/config-0.13.0-0.13.1.windows_msvc
@@ -451,7 +451,7 @@ error: breaking changes in `<old::file::format::ALL_EXTENSIONS as lazy_static::L
    | |_^
    |
    = warning: trait impl specialized or removed (breaking)
-   = note: this error originates in the macro `__lazy_static_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this error originates in the macro `__lazy_static_internal` which comes from the expansion of the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 warning: technically breaking changes in `<new::file::format::ALL_EXTENSIONS as lazy_static::LazyStatic>`
   --> config-0.13.1\src\file\format\mod.rs:60:1
@@ -466,7 +466,7 @@ warning: technically breaking changes in `<new::file::format::ALL_EXTENSIONS as
    | |_^
    |
    = note: trait impl generalized or newly added (technically breaking)
-   = note: this warning originates in the macro `__lazy_static_internal` (in Nightly builds, run with -Z macro-backtrace for more info)
+   = note: this warning originates in the macro `__lazy_static_internal` which comes from the expansion of the macro `lazy_static` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 33 previous errors; 23 warnings emitted