Reword expects

Author: azdavis

crates/analysis/src/diagnostic.rs

@@ -78,7 +78,7 @@ where
   if !ignore_after_syntax || !has_any_error {
     ret.extend(file.statics_errors.iter().filter_map(|err| {
       let idx = err.idx();
-      let syntax = file.syntax.lower.ptrs.hir_to_ast(idx).expect("no pointer for idx");
+      let syntax = file.syntax.lower.ptrs.hir_to_ast(idx).expect("should have a pointer for idx");
       let node = syntax.to_node(file.syntax.parse.root.syntax());
       let range = f(&file.syntax.pos_db, sml_syntax::node_range(&node))?;
       let message = err.display(syms_tys, options.lines).to_string();

crates/analysis/src/lib.rs

@@ -90,7 +90,7 @@ impl Analysis {
     std::iter::empty()
       .chain(res.mlb_errors.into_iter().filter_map(|err| {
         let path = err.path();
-        let group = input.groups.get(&path).expect("no such group");
+        let group = input.groups.get(&path).expect("should have a group for path");
         let err = Diagnostic {
           range: f(&group.pos_db, err.range())?,
           message: err.to_string(),
@@ -124,8 +124,8 @@ impl Analysis {
   ///
   /// If we couldn't find the source file for this path.
   pub fn update_one(&mut self, input: &input::Input, path: paths::PathId) {
-    let source_file = self.source_files.get_mut(&path).expect("no source file");
-    let contents = input.sources.get(&path).expect("no contents");
+    let source_file = self.source_files.get_mut(&path).expect("should have a source file for path");
+    let contents = input.sources.get(&path).expect("should have source for path");
     mlb_statics::update_one(&mut self.syms_tys, &input.lang, source_file, path, contents);
   }
 

crates/input/src/lib.rs

@@ -50,7 +50,7 @@ impl Input {
     ret.lang = root.config.lang;
     for group in root.groups {
       let path = paths.get_path(group.path).as_path();
-      let parent = path.parent().expect("group path with no parent");
+      let parent = path.parent().expect("should have parent for group path");
       let parent = match util::str_path(ErrorSource::default(), parent) {
         Ok(x) => x,
         Err(e) => {

crates/input/src/lower_cm.rs

@@ -315,7 +315,7 @@ where
   F: paths::FileSystem,
 {
   for (path_id, _) in cx.sml_paths {
-    let contents = st.sources.get(path_id).expect("sml file should be set").as_str();
+    let contents = st.sources.get(path_id).expect("should have sml contents for path").as_str();
     get_top_defs(contents, ac, range);
   }
 }
@@ -352,7 +352,7 @@ fn extend_with<F>(st: &mut St<'_, F>, path: paths::PathId, range: TextRange, ac:
 where
   F: paths::FileSystem,
 {
-  let other = st.cm_files.get(&path).expect("cm file should be set after successful get_one");
+  let other = st.cm_files.get(&path).expect("should set cm file after successful get_one");
   ac.extend(other.exports.keys().map(|ex| (ex.clone(), range)));
 }
 

crates/input/src/root.rs

@@ -198,7 +198,7 @@ fn disallow(
       continue;
     };
     if !allowed {
-      let p = sml_path::Path::try_new(parts).expect("split always returns non-empty iter");
+      let p = sml_path::Path::try_new(parts).expect("should not get empty iter from split");
       set.insert(p);
     }
   }

crates/input/src/util.rs

@@ -199,7 +199,8 @@ pub(crate) fn get_path_id_in_group(
     path: Some(group.path.as_path().to_owned()),
     range: group.pos_db.range_utf16(range),
   };
-  let path = group.path.as_clean_path().parent().expect("group path with no parent").join(path);
+  let path =
+    group.path.as_clean_path().parent().expect("should have parent for group path").join(path);
   let id = paths.get_id(path.as_clean_path());
   (id, path, source)
 }

crates/lang-srv/src/convert.rs

@@ -34,7 +34,7 @@ pub(crate) fn diagnostics(
 }
 
 pub(crate) fn error_url(code: diagnostic::Code) -> Url {
-  Url::parse(&format!("{}/{code}.md", analysis::URL)).expect("couldn't parse diagnostic URL")
+  Url::parse(&format!("{}/{code}.md", analysis::URL)).expect("should parse diagnostic URL")
 }
 
 struct ClickCodeHint {

crates/millet-cli/src/main.rs

@@ -216,8 +216,9 @@ impl<'a> codespan_reporting::files::Files<'a> for Files<'a> {
     if end.line > file_end.line || end.line == file_end.line && end.col > file_end.col {
       end = file_end;
     }
-    let tr =
-      db.text_range_utf16(text_pos::RangeUtf16 { start, end }).expect("line range out of range");
+    let tr = db
+      .text_range_utf16(text_pos::RangeUtf16 { start, end })
+      .expect("should have line range be in range");
     Ok(tr.into())
   }
 }

crates/mlb-statics/src/lib.rs

@@ -245,7 +245,7 @@ fn get_bas_dec(
     },
     mlb_hir::BasDec::Path(path, kind) => match kind {
       mlb_hir::PathKind::Source(file_kind) => {
-        let contents = cx.source_file_contents.get(path).expect("no source file");
+        let contents = cx.source_file_contents.get(path).expect("should have source file for path");
         let mut fix_env = scope.fix_env.clone();
         let syntax = SourceFileSyntax::new(&mut fix_env, cx.lang, *file_kind, contents);
         get_source_file(st, cx.lang, *path, scope, ac, fix_env, syntax);
@@ -259,7 +259,8 @@ fn get_bas_dec(
       let mut syntaxes: paths::PathMap<_> = paths
         .iter()
         .map(|&(path, kind)| {
-          let contents = cx.source_file_contents.get(&path).expect("no source file");
+          let contents =
+            cx.source_file_contents.get(&path).expect("should have source file for path");
           let mut fix_env = scope.fix_env.clone();
           let syntax = SourceFileSyntax::new(&mut fix_env, cx.lang, kind, contents);
           (path, (fix_env, syntax))
@@ -278,7 +279,8 @@ fn get_bas_dec(
       let mut scope = scope.clone();
       for path in order {
         let mut one_m_basis = MBasis::default();
-        let (fix_env, syntax) = syntaxes.remove(&path).expect("path from order is in syntaxes");
+        let (fix_env, syntax) =
+          syntaxes.remove(&path).expect("should have path from order be present");
         get_source_file(st, cx.lang, path, &scope, &mut one_m_basis, fix_env, syntax);
         scope.append(one_m_basis.clone());
         ac.append(one_m_basis);
@@ -371,7 +373,7 @@ pub fn add_all_doc_comments(
     .chain(low.arenas.str_dec.iter().map(|(x, _)| sml_hir::Idx::StrDec(x)))
     .chain(low.arenas.spec.iter().map(|(x, _)| sml_hir::Idx::Spec(x)));
   for idx in indices {
-    let ptr = low.ptrs.hir_to_ast(idx).expect("no syntax ptr");
+    let ptr = low.ptrs.hir_to_ast(idx).expect("should have syntax ptr");
     let node = ptr.to_node(root);
     if let Some(doc) = sml_comment::doc_comment_above(&node) {
       info.add_doc(idx, doc);

crates/sml-dynamics-tests/src/lib.rs

@@ -44,7 +44,8 @@ fn check(s: &str, steps: &[&str]) {
     bind,
     match_,
   };
-  let mut dynamics = sml_dynamics::Dynamics::new(cx, sf.lower.root.clone()).expect("no str decs");
+  let mut dynamics =
+    sml_dynamics::Dynamics::new(cx, sf.lower.root.clone()).expect("should have str decs");
   let mut stdin = std::io::stdin().lock();
   let mut buf = String::new();
   let mut steps = steps.iter();
@@ -59,11 +60,11 @@ fn check(s: &str, steps: &[&str]) {
       println!("{dynamics:#}");
     }
     if manually_advance {
-      stdin.read_line(&mut buf).expect("couldn't read");
+      stdin.read_line(&mut buf).expect("should be able to read line");
       buf.clear();
     }
     if check_steps {
-      let want = rm_whitespace(steps.next().expect("missing step").trim());
+      let want = rm_whitespace(steps.next().expect("should not be missing step").trim());
       let got = rm_whitespace(&dynamics.to_string());
       pretty_assertions::assert_str_eq!(want, got);
     }