Skip to content

Commit

Permalink
Mark pyproject_toml mod pub to remove some root re-exports
Browse files Browse the repository at this point in the history
  • Loading branch information
mbrobbel committed Nov 9, 2022
1 parent 9b59585 commit 50fac05
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/build_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use crate::project_layout::ProjectLayout;
use crate::python_interpreter::InterpreterKind;
use crate::source_distribution::source_distribution;
use crate::{
compile, BuildArtifact, Format, Metadata21, ModuleWriter, PyProjectToml, PythonInterpreter,
Target,
compile, pyproject_toml::Format, BuildArtifact, Metadata21, ModuleWriter, PyProjectToml,
PythonInterpreter, Target,
};
use anyhow::{anyhow, bail, Context, Result};
use cargo_metadata::Metadata;
Expand Down
4 changes: 2 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ pub use crate::module_writer::{
write_dist_info, ModuleWriter, PathWriter, SDistWriter, WheelWriter,
};
pub use crate::new_project::{init_project, new_project, GenerateProjectOptions};
pub use crate::pyproject_toml::{Format, Formats, GlobPattern, PyProjectToml};
pub use crate::pyproject_toml::PyProjectToml;
pub use crate::python_interpreter::PythonInterpreter;
pub use crate::target::Target;
#[cfg(feature = "upload")]
Expand All @@ -54,7 +54,7 @@ mod module_writer;
mod new_project;
mod polyfill;
mod project_layout;
mod pyproject_toml;
pub mod pyproject_toml;
mod python_interpreter;
mod source_distribution;
mod target;
Expand Down
4 changes: 3 additions & 1 deletion src/module_writer.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//! The wheel format is (mostly) specified in PEP 427
use crate::project_layout::ProjectLayout;
use crate::{BridgeModel, Format, Metadata21, PyProjectToml, PythonInterpreter, Target};
use crate::{
pyproject_toml::Format, BridgeModel, Metadata21, PyProjectToml, PythonInterpreter, Target,
};
use anyhow::{anyhow, bail, Context, Result};
use flate2::write::GzEncoder;
use flate2::Compression;
Expand Down
3 changes: 3 additions & 0 deletions src/pyproject_toml.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! A pyproject.toml as specified in PEP 517
use crate::PlatformTag;
use anyhow::{format_err, Result};
use fs_err as fs;
Expand Down Expand Up @@ -118,6 +120,7 @@ pub struct ToolMaturin {
pub config: Option<Vec<String>>,
/// Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details
pub unstable_flags: Option<Vec<String>>,
/// Additional rustc arguments
pub rustc_args: Option<Vec<String>>,
}

Expand Down
2 changes: 1 addition & 1 deletion src/source_distribution.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::module_writer::{add_data, ModuleWriter};
use crate::polyfill::MetadataCommandExt;
use crate::{BuildContext, Format, PyProjectToml, SDistWriter};
use crate::{pyproject_toml::Format, BuildContext, PyProjectToml, SDistWriter};
use anyhow::{bail, Context, Result};
use cargo_metadata::{Metadata, MetadataCommand};
use fs_err as fs;
Expand Down

0 comments on commit 50fac05

Please sign in to comment.