Skip to content

Commit

Permalink
Fix clippy on main by boxing large error variant (#3707)
Browse files Browse the repository at this point in the history
I don't really understand why this only happens on windows clippy and
not on linux too, but as usual, boxing the error variant fixes it.

Fixup for #3585
  • Loading branch information
konstin authored May 21, 2024
1 parent 2ffd453 commit e6a5da7
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions crates/uv-requirements/src/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ pub enum WorkspaceError {
#[error(transparent)]
Io(#[from] std::io::Error),
#[error("Failed to parse: `{}`", _0.user_display())]
Toml(PathBuf, #[source] toml::de::Error),
Toml(PathBuf, #[source] Box<toml::de::Error>),
#[error("No `project` section found in: `{}`", _0.simplified_display())]
MissingProject(PathBuf),
}
Expand Down Expand Up @@ -219,7 +219,7 @@ impl ProjectWorkspace {
// Read the `pyproject.toml`.
let contents = fs_err::read_to_string(&pyproject_path)?;
let pyproject_toml: PyProjectToml = toml::from_str(&contents)
.map_err(|err| WorkspaceError::Toml(pyproject_path.clone(), err))?;
.map_err(|err| WorkspaceError::Toml(pyproject_path.clone(), Box::new(err)))?;

// Extract the `[project]` metadata.
let Some(project) = pyproject_toml.project.clone() else {
Expand Down Expand Up @@ -280,7 +280,7 @@ impl ProjectWorkspace {
let pyproject_path = workspace_root.join("pyproject.toml");
let contents = fs_err::read_to_string(&pyproject_path)?;
let pyproject_toml = toml::from_str(&contents)
.map_err(|err| WorkspaceError::Toml(pyproject_path, err))?;
.map_err(|err| WorkspaceError::Toml(pyproject_path, Box::new(err)))?;

if let Some(project) = &project_in_workspace_root.project {
workspace_members.insert(
Expand All @@ -307,7 +307,7 @@ impl ProjectWorkspace {
let pyproject_path = member_root.join("pyproject.toml");
let contents = fs_err::read_to_string(&pyproject_path)?;
let pyproject_toml: PyProjectToml = toml::from_str(&contents)
.map_err(|err| WorkspaceError::Toml(pyproject_path, err))?;
.map_err(|err| WorkspaceError::Toml(pyproject_path, Box::new(err)))?;

// Extract the package name.
let Some(project) = pyproject_toml.project.clone() else {
Expand All @@ -317,7 +317,7 @@ impl ProjectWorkspace {
let pyproject_toml = workspace_root.join("pyproject.toml");
let contents = fs_err::read_to_string(&pyproject_toml)?;
let pyproject_toml = toml::from_str(&contents)
.map_err(|err| WorkspaceError::Toml(pyproject_toml, err))?;
.map_err(|err| WorkspaceError::Toml(pyproject_toml, Box::new(err)))?;
let member = WorkspaceMember {
root: member_root.clone(),
pyproject_toml,
Expand Down Expand Up @@ -364,7 +364,7 @@ fn find_workspace(
// Read the `pyproject.toml`.
let contents = fs_err::read_to_string(&pyproject_path)?;
let pyproject_toml: PyProjectToml = toml::from_str(&contents)
.map_err(|err| WorkspaceError::Toml(pyproject_path.clone(), err))?;
.map_err(|err| WorkspaceError::Toml(pyproject_path.clone(), Box::new(err)))?;

return if let Some(workspace) = pyproject_toml
.tool
Expand Down

0 comments on commit e6a5da7

Please sign in to comment.