Skip to content

Rollup of 10 pull requests #79345

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
merged 26 commits into from
Nov 23, 2020
Merged

Rollup of 10 pull requests #79345

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f7bf282
MIR visitor: Don't treat debuginfo field access as a use of the struct
camelid Nov 15, 2020
34ea5d0
const_generics: assert resolve hack causes an error
lcnr Nov 20, 2020
c85af74
update bug message for cg
lcnr Nov 20, 2020
ee6f42b
Thread `Constness` through selection
jonas-schievink Nov 22, 2020
71d350e
winnow: drop non-const cand. in favor of const
jonas-schievink Nov 22, 2020
e69fcea
const fn: allow use of trait impls from bounds
jonas-schievink Nov 22, 2020
cb40684
Add some more tests
jonas-schievink Nov 22, 2020
674f196
Use Option::and_then instead of open-coding it
LingMan Oct 11, 2020
e0871cc
Reduce boilerplate with the `?` operator
LingMan Oct 11, 2020
aca37b6
stabilize const_int_pow
tspiteri Oct 2, 2020
a6bcf7a
const_int_pow will be stabilized in 1.50.0, not in 1.49.0
tspiteri Nov 23, 2020
432a33e
Fix typo in comment
jyn514 Nov 23, 2020
b196bec
Add comment and remove obsolete special case
camelid Nov 23, 2020
a804e38
doc typo
Nov 23, 2020
cd89732
Use Option::map instead of open coding it
LingMan Nov 23, 2020
c7d1189
Add my (@flip1995) work mail to the mailmap
flip1995 Nov 23, 2020
703f176
Rollup merge of #76829 - tspiteri:const-int-pow, r=oli-obk
jonas-schievink Nov 23, 2020
d4a0569
Rollup merge of #79080 - camelid:mir-visit-debuginfo-project, r=jonas…
jonas-schievink Nov 23, 2020
c58c245
Rollup merge of #79236 - lcnr:mcg-resolve-dsb, r=eddyb
jonas-schievink Nov 23, 2020
c7a6720
Rollup merge of #79287 - jonas-schievink:const-trait-impl, r=oli-obk
jonas-schievink Nov 23, 2020
32be3ae
Rollup merge of #79324 - LingMan:and_then, r=jonas-schievink
jonas-schievink Nov 23, 2020
b4db342
Rollup merge of #79325 - LingMan:try_op, r=jonas-schievink
jonas-schievink Nov 23, 2020
b48ebc6
Rollup merge of #79330 - jyn514:typo, r=jyn514
jonas-schievink Nov 23, 2020
a0cf162
Rollup merge of #79333 - o752d:patch-3, r=Mark-Simulacrum
jonas-schievink Nov 23, 2020
064c3c1
Rollup merge of #79337 - LingMan:map, r=jyn514
jonas-schievink Nov 23, 2020
ea3c269
Rollup merge of #79343 - flip1995:mailmap, r=Mark-Simulacrum
jonas-schievink Nov 23, 2020
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
const_generics: assert resolve hack causes an error
  • Loading branch information
@lcnr
lcnr committed Nov 20, 2020
commit 34ea5d02ddaacfedd2d60460bf080b988b941d94
5 changes: 5 additions & 0 deletions compiler/rustc_resolve/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,6 +2539,7 @@ impl<'a> Resolver<'a> {
span: Span,
all_ribs: &[Rib<'a>],
) -> Res {
const CG_BUG_STR: &str = "min_const_generics resolve check didn't stop compilation";
debug!("validate_res_from_ribs({:?})", res);
let ribs = &all_ribs[rib_index + 1..];

Expand Down Expand Up @@ -2639,6 +2640,8 @@ impl<'a> Resolver<'a> {
},
);
}

self.session.delay_span_bug(span, CG_BUG_STR);
return Res::Err;
}
}
Expand Down Expand Up @@ -2720,6 +2723,8 @@ impl<'a> Resolver<'a> {
},
);
}

self.session.delay_span_bug(span, CG_BUG_STR);
return Res::Err;
}

Expand Down