Skip to content

Rollup of 4 pull requests #89879

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

Closed
matthiaskrgr wants to merge 12 commits into from
Closed

Rollup of 4 pull requests #89879

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
273e522
Fix ctrl-c causing reads of stdin to return empty on Windows.
arlosi Oct 1, 2021
9855e7d
Switch order of terms to prevent overflow
jackh726 Oct 12, 2021
c9af192
Allow static linking LLVM with ThinLTO
tmandry Oct 13, 2021
2c31c31
Fix line length
tmandry Sep 24, 2021
5c14433
Fix incorrect Box::pin suggestion
tmandry Sep 30, 2021
485ae9f
Always check predicates in can_coerce
tmandry Sep 30, 2021
156c922
Move misplaced comment
tmandry Sep 30, 2021
a8558e9
Exit early if expected type is not an adt
tmandry Sep 30, 2021
f590a97
Rollup merge of #89390 - tmandry:issue-72117, r=estebank
matthiaskrgr Oct 14, 2021
7aca070
Rollup merge of #89433 - arlosi:stdin-fix, r=joshtriplett
matthiaskrgr Oct 14, 2021
ecc351d
Rollup merge of #89823 - jackh726:project-overflow, r=oli-obk
matthiaskrgr Oct 14, 2021
078372c
Rollup merge of #89865 - tmandry:llvm-static, r=Mark-Simulacrum
matthiaskrgr Oct 14, 2021
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
Prev Previous commit
Next Next commit
Switch order of terms to prevent overflow
  • Loading branch information
@jackh726
jackh726 committed Oct 12, 2021
commit 9855e7dc7bdafaafde22d9642eaea43638cf0a8a
2 changes: 1 addition & 1 deletion compiler/rustc_trait_selection/src/traits/project.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ impl<'me, 'tcx> BoundVarReplacer<'me, 'tcx> {
fn universe_for(&mut self, debruijn: ty::DebruijnIndex) -> ty::UniverseIndex {
let infcx = self.infcx;
let index =
self.universe_indices.len() - debruijn.as_usize() + self.current_index.as_usize() - 1;
self.universe_indices.len() + self.current_index.as_usize() - debruijn.as_usize() - 1;
let universe = self.universe_indices[index].unwrap_or_else(|| {
for i in self.universe_indices.iter_mut().take(index + 1) {
*i = i.or_else(|| Some(infcx.create_next_universe()))
Expand Down