Skip to content

Commit 318ab7b

Browse files
committed
remove build world subcommand
1 parent 0fb8970 commit 318ab7b

File tree

4 files changed

+4
-149
lines changed

4 files changed

+4
-149
lines changed

src/bin/cratesfyi.rs

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ enum Toggle {
9797
)]
9898
enum CommandLine {
9999
Build {
100-
/// Skips building documentation if documentation exists
101-
#[arg(name = "SKIP_IF_EXISTS", short = 's', long = "skip")]
102-
skip_if_exists: bool,
103-
104100
#[command(subcommand)]
105101
subcommand: BuildSubcommand,
106102
},
@@ -155,10 +151,7 @@ impl CommandLine {
155151
let ctx = BinContext::new();
156152

157153
match self {
158-
Self::Build {
159-
skip_if_exists,
160-
subcommand,
161-
} => subcommand.handle_args(ctx, skip_if_exists)?,
154+
Self::Build { subcommand } => subcommand.handle_args(ctx)?,
162155
Self::StartRegistryWatcher {
163156
metric_server_socket_addr,
164157
repository_stats_updater,
@@ -355,9 +348,6 @@ impl PrioritySubcommand {
355348

356349
#[derive(Debug, Clone, PartialEq, Eq, Subcommand)]
357350
enum BuildSubcommand {
358-
/// Builds documentation of every crate
359-
World,
360-
361351
/// Builds documentation for a crate
362352
Crate {
363353
/// Crate name
@@ -395,22 +385,12 @@ enum BuildSubcommand {
395385
}
396386

397387
impl BuildSubcommand {
398-
fn handle_args(self, ctx: BinContext, skip_if_exists: bool) -> Result<()> {
388+
fn handle_args(self, ctx: BinContext) -> Result<()> {
399389
let build_queue = ctx.build_queue()?;
400390

401-
let rustwide_builder = || -> Result<RustwideBuilder> {
402-
let mut builder = RustwideBuilder::init(&ctx)?;
403-
builder.set_skip_build_if_exists(skip_if_exists);
404-
Ok(builder)
405-
};
391+
let rustwide_builder = || -> Result<RustwideBuilder> { RustwideBuilder::init(&ctx) };
406392

407393
match self {
408-
Self::World => {
409-
rustwide_builder()?
410-
.build_world()
411-
.context("Failed to build world")?;
412-
}
413-
414394
Self::Crate {
415395
crate_name,
416396
crate_version,

src/docbuilder/crates.rs

Lines changed: 0 additions & 81 deletions
This file was deleted.

src/docbuilder/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
mod crates;
21
mod limits;
32
mod rustwide_builder;
43

src/docbuilder/rustwide_builder.rs

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::db::{
33
add_build_into_database, add_doc_coverage, add_package_into_database,
44
add_path_into_remote_archive, update_crate_data_in_database, Pool,
55
};
6-
use crate::docbuilder::{crates::crates_from_path, Limits};
6+
use crate::docbuilder::Limits;
77
use crate::error::Result;
88
use crate::repositories::RepositoryStatsUpdater;
99
use crate::storage::{rustdoc_archive_path, source_archive_path};
@@ -64,7 +64,6 @@ pub struct RustwideBuilder {
6464
index: Arc<Index>,
6565
rustc_version: String,
6666
repository_stats_updater: Arc<RepositoryStatsUpdater>,
67-
skip_build_if_exists: bool,
6867
}
6968

7069
impl RustwideBuilder {
@@ -102,14 +101,9 @@ impl RustwideBuilder {
102101
index: context.index()?,
103102
rustc_version: String::new(),
104103
repository_stats_updater: context.repository_stats_updater()?,
105-
skip_build_if_exists: false,
106104
})
107105
}
108106

109-
pub fn set_skip_build_if_exists(&mut self, should: bool) {
110-
self.skip_build_if_exists = should;
111-
}
112-
113107
fn prepare_sandbox(&self, limits: &Limits) -> SandboxBuilder {
114108
SandboxBuilder::new()
115109
.cpu_limit(self.config.build_cpu_limit.map(|limit| limit as f32))
@@ -314,22 +308,6 @@ impl RustwideBuilder {
314308
Ok(())
315309
}
316310

317-
pub fn build_world(&mut self) -> Result<()> {
318-
crates_from_path(
319-
&self.config.registry_index_path.clone(),
320-
&mut |name, version| {
321-
let registry_url = self.config.registry_url.clone();
322-
let package_kind = registry_url
323-
.as_ref()
324-
.map(|r| PackageKind::Registry(r.as_str()))
325-
.unwrap_or(PackageKind::CratesIo);
326-
if let Err(err) = self.build_package(name, version, package_kind) {
327-
warn!("failed to build package {} {}: {}", name, version, err);
328-
}
329-
},
330-
)
331-
}
332-
333311
pub fn build_local_package(&mut self, path: &Path) -> Result<bool> {
334312
self.update_toolchain()?;
335313
let metadata = CargoMetadata::load_from_rustwide(&self.workspace, &self.toolchain, path)
@@ -348,10 +326,6 @@ impl RustwideBuilder {
348326
) -> Result<bool> {
349327
let mut conn = self.db.get()?;
350328

351-
if !self.should_build(&mut conn, name, version)? {
352-
return Ok(false);
353-
}
354-
355329
self.update_toolchain()?;
356330

357331
info!("building package {} {}", name, version);
@@ -859,23 +833,6 @@ impl RustwideBuilder {
859833
copy_dir_all(source, dest).map_err(Into::into)
860834
}
861835

862-
fn should_build(&self, conn: &mut Client, name: &str, version: &str) -> Result<bool> {
863-
if self.skip_build_if_exists {
864-
// Check whether no successful builds are present in the database.
865-
Ok(conn
866-
.query(
867-
"SELECT 1 FROM crates, releases, builds
868-
WHERE crates.id = releases.crate_id AND releases.id = builds.rid
869-
AND crates.name = $1 AND releases.version = $2
870-
AND builds.build_status = TRUE;",
871-
&[&name, &version],
872-
)?
873-
.is_empty())
874-
} else {
875-
Ok(true)
876-
}
877-
}
878-
879836
fn get_repo(&self, metadata: &MetadataPackage) -> Result<Option<i32>> {
880837
self.repository_stats_updater
881838
.load_repository(metadata)

0 commit comments

Comments
 (0)