Skip to content

Commit

Permalink
Reorder load_prebuilts in generate_compilation_units
Browse files Browse the repository at this point in the history
  • Loading branch information
DelevoXDG committed Dec 18, 2024
1 parent 3af99af commit 9eb6fc4
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion scarb/src/bin/scarb/commands/proc_macro_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ pub fn run(config: &mut Config) -> Result<()> {
no_default_features: false,
},
true,
&ws,
true,
&ws,
)?;

// Compile procedural macros only.
Expand Down
2 changes: 1 addition & 1 deletion scarb/src/ops/compile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ where
&resolve,
&opts.features,
opts.ignore_cairo_version,
ws,
true,
ws,
)?
.into_iter()
.filter(|cu| {
Expand Down
2 changes: 1 addition & 1 deletion scarb/src/ops/expand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ pub fn expand(package: Package, opts: ExpandOpts, ws: &Workspace<'_>) -> Result<
&resolve,
&opts.features,
opts.ignore_cairo_version,
ws,
true,
ws,
)?;

// Compile procedural macros.
Expand Down
2 changes: 1 addition & 1 deletion scarb/src/ops/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ pub fn collect_metadata(opts: &MetadataOptions, ws: &Workspace<'_>) -> Result<m:
&resolve,
&opts.features,
opts.ignore_cairo_version,
false,
ws,
true,
)?
.iter()
.flat_map(collect_compilation_unit_metadata)
Expand Down
2 changes: 1 addition & 1 deletion scarb/src/ops/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ pub fn generate_compilation_units(
resolve: &WorkspaceResolve,
enabled_features: &FeaturesOpts,
ignore_cairo_version: bool,
ws: &Workspace<'_>,
load_prebuilts: bool,
ws: &Workspace<'_>,
) -> Result<Vec<CompilationUnit>> {
let mut units = Vec::with_capacity(ws.members().size_hint().0);
let members = ws
Expand Down

0 comments on commit 9eb6fc4

Please sign in to comment.