Skip to content
This repository has been archived by the owner on Apr 5, 2024. It is now read-only.

Commit

Permalink
Auto merge of #317 - JohnTitor:rustup-2022-06-09, r=JohnTitor
Browse files Browse the repository at this point in the history
Rustup to rust-lang/rust#97447

Fixes #316

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
  • Loading branch information
bors committed Jun 9, 2022
2 parents 7f73903 + aa8ccf2 commit 127312f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-05-23` toolchain.
You can install it by using `rustup install nightly-2022-05-23` if you already have rustup.
It's recommended to use `nightly-2022-06-09` toolchain.
You can install it by using `rustup install nightly-2022-06-09` if you already have rustup.
Then you can do:

```sh
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-05-23
$ cargo +nightly-2022-05-23 install --git https://github.com/rust-lang/rust-semverver
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-06-09
$ cargo +nightly-2022-06-09 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
Expand Down Expand Up @@ -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-05-23 install --git https://github.com/rust-lang/rust-semverver
cargo +nightly-2022-06-09 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
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# NOTE: Keep in sync with nightly date on README
[toolchain]
channel = "nightly-2022-05-23"
channel = "nightly-2022-06-09"
components = ["llvm-tools-preview", "rustc-dev"]
3 changes: 2 additions & 1 deletion src/translate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ use rustc_infer::infer::InferCtxt;
use rustc_middle::ty::{
fold::{BottomUpFolder, TypeFoldable, TypeFolder},
subst::{GenericArg, InternalSubsts, SubstsRef},
GenericParamDefKind, ParamEnv, Predicate, Region, Term, TraitRef, Ty, TyCtxt, Unevaluated,
GenericParamDefKind, ParamEnv, Predicate, Region, Term, TraitRef, Ty, TyCtxt,
TypeSuperFoldable, Unevaluated,
};
use std::collections::HashMap;

Expand Down

0 comments on commit 127312f

Please sign in to comment.