Fixed grammar/style in error messages and reblessed tests.

Author: Alexander Regueiro

src/librustc/mir/interpret/error.rs

@@ -430,13 +430,13 @@ impl fmt::Debug for UnsupportedOpInfo<'tcx> {
  match self {
  PointerOutOfBounds { ptr, msg, allocation_size } => {
  write!(f, "{} failed: pointer must be in-bounds at offset {}, \
- but is outside bounds of allocation {} which has size {}",
+  but is outside bounds of allocation {} which has size {}",
  msg, ptr.offset.bytes(), ptr.alloc_id, allocation_size.bytes())
  },
  ValidationFailure(ref err) => {
  write!(f, "type validation failed: {}", err)
  }
- NoMirFor(ref func) => write!(f, "no mir for `{}`", func),
+ NoMirFor(ref func) => write!(f, "no MIR for `{}`", func),
  FunctionAbiMismatch(caller_abi, callee_abi) =>
  write!(f, "tried to call a function with ABI {:?} using caller ABI {:?}",
  callee_abi, caller_abi),
@@ -451,9 +451,9 @@ impl fmt::Debug for UnsupportedOpInfo<'tcx> {
  FunctionArgCountMismatch =>
  write!(f, "tried to call a function with incorrect number of arguments"),
  ReallocatedWrongMemoryKind(ref old, ref new) =>
- write!(f, "tried to reallocate memory from {} to {}", old, new),
+ write!(f, "tried to reallocate memory from `{}` to `{}`", old, new),
  DeallocatedWrongMemoryKind(ref old, ref new) =>
- write!(f, "tried to deallocate {} memory but gave {} as the kind", old, new),
+ write!(f, "tried to deallocate `{}` memory but gave `{}` as the kind", old, new),
  InvalidChar(c) =>
  write!(f, "tried to interpret an invalid 32-bit value as a char: {}", c),
  AlignmentCheckFailed { required, has } =>
@@ -462,7 +462,7 @@ impl fmt::Debug for UnsupportedOpInfo<'tcx> {
  TypeNotPrimitive(ty) =>
  write!(f, "expected primitive type, got {}", ty),
  PathNotFound(ref path) =>
- write!(f, "Cannot find path {:?}", path),
+ write!(f, "cannot find path {:?}", path),
  IncorrectAllocationInformation(size, size2, align, align2) =>
  write!(f, "incorrect alloc info: expected size {} and align {}, \
  got size {} and align {}",
@@ -525,7 +525,7 @@ impl fmt::Debug for UnsupportedOpInfo<'tcx> {
  InvalidBoolOp(_) =>
  write!(f, "invalid boolean operation"),
  UnterminatedCString(_) =>
- write!(f, "attempted to get length of a null terminated string, but no null \
+ write!(f, "attempted to get length of a null-terminated string, but no null \
  found before end of allocation"),
  ReadUndefBytes(_) =>
  write!(f, "attempted to read undefined bytes"),

src/librustc/session/config.rs

@@ -1998,7 +1998,7 @@ pub fn parse_error_format(
  Some(arg) => early_error(
  ErrorOutputType::HumanReadable(HumanReadableErrorType::Default(color)),
  &format!(
- "argument for --error-format must be `human`, `json` or \
+ "argument for `--error-format` must be `human`, `json` or \
  `short` (instead was `{}`)",
  arg
  ),
@@ -2037,7 +2037,7 @@ pub fn build_session_options_and_crate_config(
  early_error(
  ErrorOutputType::default(),
  &format!(
- "argument for --edition must be one of: \
+ "argument for `--edition` must be one of: \
  {}. (instead was `{}`)",
  EDITION_NAME_LIST,
  arg
@@ -2051,7 +2051,7 @@ pub fn build_session_options_and_crate_config(
  early_error(
  ErrorOutputType::default(),
  &format!(
- "Edition {} is unstable and only \
+ "edition {} is unstable and only \
  available for nightly builds of rustc.",
  edition,
  )
@@ -2075,14 +2075,14 @@ pub fn build_session_options_and_crate_config(
  if let ErrorOutputType::Json { pretty: true, json_rendered } = error_format {
  early_error(
  ErrorOutputType::Json { pretty: false, json_rendered },
- "--error-format=pretty-json is unstable",
+ "`--error-format=pretty-json` is unstable",
  );
  }
  if let ErrorOutputType::HumanReadable(HumanReadableErrorType::AnnotateSnippet(_)) =
  error_format {
  early_error(
  ErrorOutputType::Json { pretty: false, json_rendered },
- "--error-format=human-annotate-rs is unstable",
+ "`--error-format=human-annotate-rs` is unstable",
  );
  }
  }
@@ -2132,8 +2132,8 @@ pub fn build_session_options_and_crate_config(
  early_warn(
  error_format,
  &format!(
- "--emit={} with -o incompatible with \
- -C codegen-units=N for N > 1",
+ "`--emit={}` with `-o` incompatible with \
+ `-C codegen-units=N` for N > 1",
  ot
  ),
  );
@@ -2153,21 +2153,21 @@ pub fn build_session_options_and_crate_config(
  if debugging_opts.threads == Some(0) {
  early_error(
  error_format,
- "Value for threads must be a positive nonzero integer",
+ "value for threads must be a positive non-zero integer",
  );
  }
 
  if debugging_opts.threads.unwrap_or(1) > 1 && debugging_opts.fuel.is_some() {
  early_error(
  error_format,
- "Optimization fuel is incompatible with multiple threads",
+ "optimization fuel is incompatible with multiple threads",
  );
  }
 
  if codegen_units == Some(0) {
  early_error(
  error_format,
- "Value for codegen units must be a positive nonzero integer",
+ "value for codegen units must be a positive non-zero integer",
  );
  }
 

src/librustc/traits/object_safety.rs

@@ -368,7 +368,7 @@ impl<'tcx> TyCtxt<'tcx> {
  match self.layout_of(param_env.and(ty)) {
  Ok(layout) => &layout.abi,
  Err(err) => bug!(
- "Error: {}\n while computing layout for type {:?}", err, ty
+ "error: {}\n while computing layout for type {:?}", err, ty
  )
  }
  };
@@ -384,7 +384,7 @@ impl<'tcx> TyCtxt<'tcx> {
  self.sess.delay_span_bug(
  self.def_span(method.def_id),
  &format!(
- "Receiver when Self = () should have a Scalar ABI, found {:?}",
+ "receiver when `Self = ()` should have a Scalar ABI; found {:?}",
  abi
  ),
  );
@@ -406,7 +406,8 @@ impl<'tcx> TyCtxt<'tcx> {
  self.sess.delay_span_bug(
  self.def_span(method.def_id),
  &format!(
- "Receiver when Self = {} should have a ScalarPair ABI, found {:?}",
+ "receiver when `Self = {}` should have a ScalarPair ABI; \
+ found {:?}",
  trait_object_ty, abi
  ),
  );

src/librustc_mir/borrow_check/conflict_errors.rs

@@ -98,7 +98,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
  &self.describe_place_with_options(moved_place, IncludingDowncast(true))
  .unwrap_or_else(|| "_".to_owned()),
  );
- err.span_label(span, format!("use of possibly uninitialized {}", item_msg));
+ err.span_label(span, format!("use of possibly-uninitialized {}", item_msg));
 
  use_spans.var_span_label(
  &mut err,

src/librustc_mir/const_eval.rs

@@ -533,8 +533,8 @@ pub fn error_to_const_error<'mir, 'tcx>(
 
 pub fn note_on_undefined_behavior_error() -> &'static str {
  "The rules on what exactly is undefined behavior aren't clear, \
- so this check might be overzealous. Please open an issue on the rust compiler \
- repository if you believe it should not be considered undefined behavior"
+  so this check might be overzealous. Please open an issue on the rustc \
+  repository if you believe it should not be considered undefined behavior."
 }
 
 fn validate_and_turn_into_const<'tcx>(

src/librustc_mir/error_codes.rs

@@ -748,7 +748,7 @@ It is not allowed to use or capture an uninitialized variable. For example:
 ```compile_fail,E0381
 fn main() {
  let x: i32;
- let y = x; // error, use of possibly uninitialized variable
+ let y = x; // error, use of possibly-uninitialized variable
 }
 ```
 

src/librustc_mir/util/borrowck_errors.rs

@@ -50,7 +50,7 @@ impl<'cx, 'tcx> crate::borrow_check::MirBorrowckCtxt<'cx, 'tcx> {
  self,
  span,
  E0381,
- "{} of possibly uninitialized variable: `{}`",
+ "{} of possibly-uninitialized variable: `{}`",
  verb,
  desc,
  )

src/libsyntax/parse/parser/expr.rs

@@ -982,7 +982,7 @@ impl<'a> Parser<'a> {
  }
  if self.is_do_catch_block() {
  let mut db = self.fatal("found removed `do catch` syntax");
- db.help("Following RFC #2388, the new non-placeholder syntax is `try`");
+ db.help("following RFC #2388, the new non-placeholder syntax is `try`");
  return Err(db);
  }
  if self.is_try_block() {

src/libsyntax/parse/parser/stmt.rs

@@ -469,7 +469,7 @@ impl<'a> Parser<'a> {
  self.diagnostic().struct_span_warn(self.token.span, {
  &format!("expected `;`, found {}", self.this_token_descr())
  }).note({
- "This was erroneously allowed and will become a hard error in a future release"
+ "this was erroneously allowed and will become a hard error in a future release"
  }).emit();
  }
 }

src/test/ui/asm/asm-out-read-uninit.rs

@@ -20,7 +20,7 @@ pub fn main() {
  let x: isize;
  unsafe {
  asm!("mov $1, $0" : "=r"(x) : "r"(x));
- //~^ ERROR use of possibly uninitialized variable: `x`
+ //~^ ERROR use of possibly-uninitialized variable: `x`
  }
  foo(x);
 }