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

Commit 4a22c94

Browse files
committed
Auto merge of #338 - JohnTitor:rustup-2022-08-03, r=JohnTitor
Rustup to rust-lang/rust#95884 Fixes #337 Signed-off-by: Yuki Okushi <[email protected]>
2 parents a4831f8 + 678729a commit 4a22c94

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ repository and compiled from source or installed from
2727
of the nightly toolchain is supported at any given time.
2828

2929
<!-- NOTE: Keep in sync with nightly date on rust-toolchain. -->
30-
It's recommended to use `nightly-2022-07-20` toolchain.
31-
You can install it by using `rustup install nightly-2022-07-20` if you already have rustup.
30+
It's recommended to use `nightly-2022-08-03` toolchain.
31+
You can install it by using `rustup install nightly-2022-08-03` if you already have rustup.
3232
Then you can do:
3333

3434
```sh
35-
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-07-20
36-
$ cargo +nightly-2022-07-20 install --git https://github.com/rust-lang/rust-semverver
35+
$ rustup component add rustc-dev llvm-tools-preview --toolchain nightly-2022-08-03
36+
$ cargo +nightly-2022-08-03 install --git https://github.com/rust-lang/rust-semverver
3737
```
3838

3939
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
122122

123123
```sh
124124
# install a current version of rust-semverver
125-
cargo +nightly-2022-07-20 install --git https://github.com/rust-lang/rust-semverver
125+
cargo +nightly-2022-08-03 install --git https://github.com/rust-lang/rust-semverver
126126
# fetch the version in the manifest of your crate (adapt this to your usecase if needed)
127127
eval "current_version=$(grep -e '^version = .*$' Cargo.toml | cut -d ' ' -f 3)"
128128
# run the semver checks and output them for convenience

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# NOTE: Keep in sync with nightly date on README
22
[toolchain]
3-
channel = "nightly-2022-07-20"
3+
channel = "nightly-2022-08-03"
44
components = ["llvm-tools-preview", "rustc-dev"]

src/traverse.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ fn diff_method<'tcx>(changes: &mut ChangeSet, tcx: TyCtxt<'tcx>, old: AssocItem,
389389
);
390390
}
391391

392-
let old_pub = old.vis == Public;
393-
let new_pub = new.vis == Public;
392+
let old_pub = old.visibility(tcx) == Public;
393+
let new_pub = new.visibility(tcx) == Public;
394394

395395
if old_pub && !new_pub {
396396
changes.add_change(ChangeType::ItemMadePrivate, old.def_id, None);
@@ -655,14 +655,14 @@ fn diff_traits<'tcx>(
655655
}
656656
(Some(old_item), None) => {
657657
let change_type = ChangeType::TraitItemRemoved {
658-
defaulted: old_item.defaultness.has_value(),
658+
defaulted: old_item.defaultness(tcx).has_value(),
659659
};
660660
changes.add_change(change_type, old, Some(tcx.def_span(old_item.def_id)));
661661
id_mapping.add_non_mapped(old_item.def_id);
662662
}
663663
(None, Some(new_item)) => {
664664
let change_type = ChangeType::TraitItemAdded {
665-
defaulted: new_item.defaultness.has_value(),
665+
defaulted: new_item.defaultness(tcx).has_value(),
666666
sealed_trait: old_sealed,
667667
};
668668
changes.add_change(change_type, old, Some(tcx.def_span(new_item.def_id)));
@@ -1061,7 +1061,7 @@ fn diff_inherent_impls<'tcx>(
10611061
orig_item.name,
10621062
item_span,
10631063
item_span,
1064-
parent_output && orig_assoc_item.vis == Public,
1064+
parent_output && orig_assoc_item.visibility(tcx) == Public,
10651065
);
10661066

10671067
// ... determine the set of target impls that serve as candidates
@@ -1082,7 +1082,7 @@ fn diff_inherent_impls<'tcx>(
10821082
.any(|&(target_impl_def_id, target_item_def_id)| {
10831083
let target_assoc_item = tcx.associated_item(target_item_def_id);
10841084

1085-
if parent_output && target_assoc_item.vis == Public {
1085+
if parent_output && target_assoc_item.visibility(tcx) == Public {
10861086
changes.set_output(orig_item.parent_def_id);
10871087
}
10881088

0 commit comments

Comments
 (0)