From ec1e6f79f3590fbaf2a286eed65fab683779b3a3 Mon Sep 17 00:00:00 2001
From: Evan Rittenhouse <evanrittenhouse@gmail.com>
Date: Thu, 15 Jun 2023 12:22:42 -0500
Subject: [PATCH] Fix pre-commit issues

---
 crates/ruff/src/jupyter/notebook.rs |  4 +---
 crates/ruff/src/test.rs             | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/crates/ruff/src/jupyter/notebook.rs b/crates/ruff/src/jupyter/notebook.rs
index 25087dd458237..c50c9b280bbca 100644
--- a/crates/ruff/src/jupyter/notebook.rs
+++ b/crates/ruff/src/jupyter/notebook.rs
@@ -418,12 +418,10 @@ mod test {
     use crate::jupyter::schema::Cell;
     use crate::jupyter::Notebook;
     use crate::registry::Rule;
+    use crate::source_kind::CodeExtractor;
     use crate::test::{test_notebook_path, test_resource_path};
     use crate::{assert_messages, settings};
 
-    use crate::source_kind::CodeExtractor;
-    use crate::test::test_resource_path;
-
     /// Read a Jupyter cell from the `resources/test/fixtures/jupyter/cell` directory.
     fn read_jupyter_cell(path: impl AsRef<Path>) -> Result<Cell> {
         let path = test_resource_path("fixtures/jupyter/cell").join(path);
diff --git a/crates/ruff/src/test.rs b/crates/ruff/src/test.rs
index 1e46037db7115..c1e26487b1097 100644
--- a/crates/ruff/src/test.rs
+++ b/crates/ruff/src/test.rs
@@ -22,11 +22,11 @@ use crate::packaging::detect_package_root;
 use crate::registry::AsRule;
 use crate::rules::pycodestyle::rules::syntax_error;
 use crate::settings::{flags, Settings};
-use crate::source_kind::SourceKind;
+use crate::source_kind::{CodeExtractor, SourceKind};
 
 #[cfg(not(fuzzing))]
-fn read_jupyter_notebook(path: &Path) -> Result<Notebook> {
-    Notebook::read(path).map_err(|err| {
+fn extract_code_from_jupyter_notebook(path: &Path) -> Result<Notebook> {
+    Notebook::extract_code(path).map_err(|err| {
         anyhow::anyhow!(
             "Failed to read notebook file `{}`: {:?}",
             path.display(),
@@ -59,10 +59,10 @@ pub(crate) fn test_notebook_path(
     settings: &Settings,
 ) -> Result<(Vec<Message>, SourceKind)> {
     let path = test_resource_path("fixtures/jupyter").join(path);
-    let mut source_kind = SourceKind::Jupyter(read_jupyter_notebook(&path)?);
+    let mut source_kind = SourceKind::Jupyter(extract_code_from_jupyter_notebook(&path)?);
     let messages = test_contents(&mut source_kind, &path, settings);
     let expected_notebook =
-        read_jupyter_notebook(&test_resource_path("fixtures/jupyter").join(expected))?;
+        extract_code_from_jupyter_notebook(&test_resource_path("fixtures/jupyter").join(expected))?;
     if let SourceKind::Jupyter(notebook) = &source_kind {
         assert_eq!(notebook.cell_offsets(), expected_notebook.cell_offsets());
         assert_eq!(notebook.index(), expected_notebook.index());