Skip to content

Rollup of 3 pull requests #68363

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 9 commits into from
Jan 19, 2020
Merged

Rollup of 3 pull requests #68363

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a1a0aea
clean up E0195 explanation
GuillaumeGomez Jan 15, 2020
6f1bdb4
clean up E0197 explanation
GuillaumeGomez Jan 15, 2020
a70b240
Make iter::Empty<T> implement Send and Sync for any T
LunaBorowska Jan 18, 2020
d7a18f8
Add a test for iter::empty::<*mut i32> being Sync and Send
LunaBorowska Jan 16, 2019
e1f70f7
[const-prop] Remove useless typedef
wesleywiser Jan 18, 2020
a957f0d
[const-prop] Run `x.py fmt`
wesleywiser Jan 18, 2020
cba48b8
Rollup merge of #67682 - wesleywiser:remove_opty_const_typedef, r=Dyl…
Dylan-DPC Jan 19, 2020
a29ba00
Rollup merge of #68247 - GuillaumeGomez:clean-up-err-codes, r=Dylan-DPC
Dylan-DPC Jan 19, 2020
d276e69
Rollup merge of #68348 - xfix:patch-14, r=nagisa
Dylan-DPC Jan 19, 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-prop] Run x.py fmt
  • Loading branch information
@wesleywiser
wesleywiser committed Jan 18, 2020
commit a957f0d7ff2c6389ec94f921d9ba4e9fade26a72
6 changes: 1 addition & 5 deletions src/librustc_mir/transform/const_prop.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,7 @@ impl<'mir, 'tcx> ConstPropagator<'mir, 'tcx> {
r
}

fn eval_constant(
&mut self,
c: &Constant<'tcx>,
source_info: SourceInfo,
) -> Option<OpTy<'tcx>> {
fn eval_constant(&mut self, c: &Constant<'tcx>, source_info: SourceInfo) -> Option<OpTy<'tcx>> {
self.ecx.tcx.span = c.span;

// FIXME we need to revisit this for #67176
Expand Down