From 553bc7443ad2df2b5ac8b23962ade30bb428f474 Mon Sep 17 00:00:00 2001
From: Charlie Marsh <charlie.r.marsh@gmail.com>
Date: Thu, 24 Nov 2022 22:39:07 -0500
Subject: [PATCH] Remove UserConfiguration struct (#900)

---
 src/main.rs          |  8 ++---
 src/settings/mod.rs  |  1 -
 src/settings/user.rs | 73 --------------------------------------------
 3 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 src/settings/user.rs

diff --git a/src/main.rs b/src/main.rs
index 84ece31b6f..3ace89caeb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,6 @@ use ::ruff::logging::{set_up_logging, LogLevel};
 use ::ruff::message::Message;
 use ::ruff::printer::{Printer, SerializationFormat};
 use ::ruff::settings::configuration::Configuration;
-use ::ruff::settings::user::UserConfiguration;
 use ::ruff::settings::{pyproject, Settings};
 #[cfg(feature = "update-informer")]
 use ::ruff::updates;
@@ -61,10 +60,9 @@ fn show_settings(
     project_root: Option<PathBuf>,
     pyproject: Option<PathBuf>,
 ) {
-    println!(
-        "{:#?}",
-        UserConfiguration::from_configuration(configuration, project_root, pyproject)
-    );
+    println!("Resolved configuration: {configuration:#?}");
+    println!("Found project root at: {project_root:?}");
+    println!("Found pyproject.toml at: {pyproject:?}");
 }
 
 #[derive(Serialize)]
diff --git a/src/settings/mod.rs b/src/settings/mod.rs
index 602762a2fc..0777756c1b 100644
--- a/src/settings/mod.rs
+++ b/src/settings/mod.rs
@@ -25,7 +25,6 @@ pub mod configuration;
 pub mod options;
 pub mod pyproject;
 pub mod types;
-pub mod user;
 
 #[derive(Debug)]
 pub struct Settings {
diff --git a/src/settings/user.rs b/src/settings/user.rs
deleted file mode 100644
index 877373f8a0..0000000000
--- a/src/settings/user.rs
+++ /dev/null
@@ -1,73 +0,0 @@
-//! Structs to render user-facing settings.
-
-use std::path::PathBuf;
-
-use regex::Regex;
-
-use crate::checks_gen::CheckCodePrefix;
-use crate::settings::types::{FilePattern, PerFileIgnore, PythonVersion};
-use crate::{
-    flake8_annotations, flake8_quotes, flake8_tidy_imports, isort, pep8_naming, Configuration,
-};
-
-/// Struct to render user-facing configuration.
-#[derive(Debug)]
-pub struct UserConfiguration {
-    pub dummy_variable_rgx: Regex,
-    pub exclude: Vec<FilePattern>,
-    pub extend_exclude: Vec<FilePattern>,
-    pub extend_ignore: Vec<CheckCodePrefix>,
-    pub extend_select: Vec<CheckCodePrefix>,
-    pub fix: bool,
-    pub fixable: Vec<CheckCodePrefix>,
-    pub ignore: Vec<CheckCodePrefix>,
-    pub line_length: usize,
-    pub per_file_ignores: Vec<PerFileIgnore>,
-    pub select: Vec<CheckCodePrefix>,
-    pub show_source: bool,
-    pub src: Vec<PathBuf>,
-    pub target_version: PythonVersion,
-    pub unfixable: Vec<CheckCodePrefix>,
-    // Plugins
-    pub flake8_annotations: flake8_annotations::settings::Settings,
-    pub flake8_quotes: flake8_quotes::settings::Settings,
-    pub flake8_tidy_imports: flake8_tidy_imports::settings::Settings,
-    pub isort: isort::settings::Settings,
-    pub pep8_naming: pep8_naming::settings::Settings,
-    // Non-settings exposed to the user
-    pub project_root: Option<PathBuf>,
-    pub pyproject: Option<PathBuf>,
-}
-
-impl UserConfiguration {
-    pub fn from_configuration(
-        configuration: Configuration,
-        project_root: Option<PathBuf>,
-        pyproject: Option<PathBuf>,
-    ) -> Self {
-        Self {
-            dummy_variable_rgx: configuration.dummy_variable_rgx,
-            exclude: configuration.exclude,
-            extend_exclude: configuration.extend_exclude,
-            extend_ignore: configuration.extend_ignore,
-            extend_select: configuration.extend_select,
-            fix: configuration.fix,
-            fixable: configuration.fixable,
-            unfixable: configuration.unfixable,
-            ignore: configuration.ignore,
-            line_length: configuration.line_length,
-            per_file_ignores: configuration.per_file_ignores,
-            select: configuration.select,
-            src: configuration.src,
-            target_version: configuration.target_version,
-            show_source: configuration.show_source,
-            flake8_annotations: configuration.flake8_annotations,
-            flake8_quotes: configuration.flake8_quotes,
-            flake8_tidy_imports: configuration.flake8_tidy_imports,
-            isort: configuration.isort,
-            pep8_naming: configuration.pep8_naming,
-            project_root,
-            pyproject,
-        }
-    }
-}