From 205490b85c5024006e89c6443a1ba6f21bda4b89 Mon Sep 17 00:00:00 2001 From: Alexander Regueiro Date: Tue, 26 Feb 2019 18:37:05 +0000 Subject: [PATCH] Fixed nits raised in review. --- src/bin/miri.rs | 2 +- src/lib.rs | 5 ++--- src/range_map.rs | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/miri.rs b/src/bin/miri.rs index 0f1501d5913..c1cad6edc0a 100644 --- a/src/bin/miri.rs +++ b/src/bin/miri.rs @@ -178,7 +178,7 @@ fn find_sysroot() -> String { _ => { option_env!("RUST_SYSROOT") .expect( - "could not find sysroot. either set `MIRI_SYSROOT` at run-time, or at \ + "could not find sysroot. Either set `MIRI_SYSROOT` at run-time, or at \ build-time specify `RUST_SYSROOT` env var or use rustup or multirust", ) .to_owned() diff --git a/src/lib.rs b/src/lib.rs index df118ea0982..31a02a7466e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -39,8 +39,7 @@ pub use crate::intrinsic::EvalContextExt as IntrinsicEvalContextExt; pub use crate::tls::{EvalContextExt as TlsEvalContextExt, TlsData}; use crate::range_map::RangeMap; -// FIXME: rustc bug, issue . -#[allow(unused_imports)] +#[allow(unused_imports)] // FIXME: rustc bug, issue . pub use crate::helpers::{EvalContextExt as HelpersEvalContextExt}; use crate::mono_hash_map::MonoHashMap; pub use crate::stacked_borrows::{EvalContextExt as StackedBorEvalContextExt}; @@ -129,7 +128,7 @@ pub fn create_ecx<'a, 'mir: 'a, 'tcx: 'mir>( let dest = ecx.eval_place(&mir::Place::Local(args.next().unwrap()))?; let argc = Scalar::from_uint(config.args.len() as u128, dest.layout.size); ecx.write_scalar(argc, dest)?; - // Store argc for macOS: `_NSGetArgc`. + // Store argc for macOS's `_NSGetArgc`. { let argc_place = ecx.allocate(dest.layout, MiriMemoryKind::Env.into()); ecx.write_scalar(argc, argc_place.into())?; diff --git a/src/range_map.rs b/src/range_map.rs index f94917e612a..16e7e272417 100644 --- a/src/range_map.rs +++ b/src/range_map.rs @@ -14,8 +14,9 @@ #[derive(Clone, Debug)] struct Elem { - /// The range covered by this element, never empty. + /// The range covered by this element; never empty. range: ops::Range, + /// The data stored for this element. data: T, } #[derive(Clone, Debug)] @@ -49,11 +50,11 @@ fn find_offset(&self, offset: u64) -> usize { let candidate = left.checked_add(right).unwrap() / 2; let elem = &self.v[candidate]; if offset < elem.range.start { - // we are too far right (offset is further left) + // We are too far right (offset is further left). debug_assert!(candidate < right); // we are making progress right = candidate; } else if offset >= elem.range.end { - // we are too far left (offset is further right) + // We are too far left (offset is further right). debug_assert!(candidate >= left); // we are making progress left = candidate+1; } else { -- 2.44.0