Skip to content

Rollup of 4 pull requests #50245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 8 commits into from
Apr 26, 2018
Merged

Rollup of 4 pull requests #50245

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d37ba1
mark std::str::replacen and std::str::replace as #[must_use].
matthiaskrgr Apr 23, 2018
d81d081
Hash EntryKind::AssociatedConst const data
wesleywiser Apr 25, 2018
ac0f99c
Some JS improvements
GuillaumeGomez Apr 24, 2018
1bcb267
Added missing `.` in docs.
ralfbiedert Apr 25, 2018
3b49b27
Rollup merge of #50177 - matthiaskrgr:std_std_replacen__must_use, r=o…
GuillaumeGomez Apr 26, 2018
0d758ec
Rollup merge of #50207 - wesleywiser:hash_const_data, r=eddyb
GuillaumeGomez Apr 26, 2018
8f6b427
Rollup merge of #50214 - GuillaumeGomez:JS-improvements, r=QuietMisdr…
GuillaumeGomez Apr 26, 2018
438f3ca
Rollup merge of #50219 - ralfbiedert:master, r=frewsxcv
GuillaumeGomez Apr 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/librustc_metadata/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,10 @@ impl<'a, 'gcx> HashStable<StableHashingContext<'a>> for EntryKind<'gcx> {
EntryKind::AssociatedType(associated_container) => {
associated_container.hash_stable(hcx, hasher);
}
EntryKind::AssociatedConst(associated_container, qualif, _) => {
EntryKind::AssociatedConst(associated_container, qualif, ref const_data) => {
associated_container.hash_stable(hcx, hasher);
qualif.hash_stable(hcx, hasher);
const_data.hash_stable(hcx, hasher);
}
}
}
Expand Down