Fix merge conflicts

astral-sh · Jun 4, 2024 · 8f75726 · 8f75726
1 parent 82c5f17
commit 8f75726
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/red_knot/src/types/infer.rs b/crates/red_knot/src/types/infer.rs
@@ -213,7 +213,6 @@ fn infer_expr_type(db: &dyn SemanticDb, file_id: FileId, expr: &ast::Expr) -> Qu
 
 #[cfg(test)]
 mod tests {
-    use textwrap::dedent;
 
     use crate::db::tests::TestDb;
     use crate::db::{HasJar, SemanticJar};
@@ -251,7 +250,7 @@ mod tests {
 
     fn write_to_path(case: &TestCase, relpath: &str, contents: &str) -> anyhow::Result<()> {
         let path = case.src.path().join(relpath);
-        std::fs::write(path, dedent(contents))?;
+        std::fs::write(path, contents)?;
         Ok(())
     }