Merge pull request #2781 from imp/2780

rustup to nightly 2018-05-19
2018-05-20 09:42:54 +02:00 · 2018-05-20 09:42:54 +02:00 · 26423dc392
commit 26423dc392
parent 06f981f2e9 7b715583d4
1 changed files with 1 additions and 1 deletions
--- a/clippy_lints/src/consts.rs
+++ b/clippy_lints/src/consts.rs
@ -432,7 +432,7 @@ pub fn miri_to_const<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, result: &ty::Const<'
                        .interpret_interner
                        .get_alloc(ptr.alloc_id)
                        .unwrap();
-                    let offset = ptr.offset as usize;
+                    let offset = ptr.offset.bytes() as usize;
                    let n = n as usize;
                    String::from_utf8(alloc.bytes[offset..(offset + n)].to_owned()).ok().map(Constant::Str)
                },