Skip to content

Commit

Permalink
Rename metadata -> docsrs_metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
jyn514 authored and Joshua Nelson committed Aug 28, 2020
1 parent c5bfde3 commit 02105e7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 16 deletions.
18 changes: 9 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ r2d2_postgres = "0.16"
# url@2 for other usecases
url = { version = "2.1.1", features = ["serde"] }
badge = { path = "src/web/badge" }
metadata = { path = "src/docbuilder/metadata" }
docsrs-metadata = { path = "src/docbuilder/metadata" }
backtrace = "0.3"
failure = { version = "0.1.3", features = ["backtrace"] }
comrak = { version = "0.8", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion src/docbuilder/metadata/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "metadata"
name = "docsrs-metadata"
version = "0.1.0"
authors = ["Joshua Nelson <[email protected]>"]
edition = "2018"
Expand Down
1 change: 0 additions & 1 deletion src/docbuilder/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ mod rustwide_builder;
pub(crate) use self::limits::Limits;
pub use self::rustwide_builder::RustwideBuilder;
pub(crate) use self::rustwide_builder::{BuildResult, DocCoverage};
use metadata::Metadata;

use crate::db::Pool;
use crate::error::Result;
Expand Down
7 changes: 3 additions & 4 deletions src/docbuilder/rustwide_builder.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use super::DocBuilder;
use super::Metadata;
use crate::db::blacklist::is_blacklisted;
use crate::db::file::add_path_into_database;
use crate::db::{
Expand All @@ -12,9 +11,9 @@ use crate::index::api::ReleaseData;
use crate::storage::CompressionAlgorithms;
use crate::utils::{copy_doc_dir, parse_rustc_version, CargoMetadata};
use crate::{Metrics, Storage};
use docsrs_metadata::{Metadata, DEFAULT_TARGETS, HOST_TARGET};
use failure::ResultExt;
use log::{debug, info, warn, LevelFilter};
use metadata::{DEFAULT_TARGETS, HOST_TARGET};
use rustwide::cmd::{Command, SandboxBuilder};
use rustwide::logging::{self, LogStorage};
use rustwide::toolchain::ToolchainError;
Expand Down Expand Up @@ -338,7 +337,7 @@ impl RustwideBuilder {
let res = build_dir
.build(&self.toolchain, &krate, self.prepare_sandbox(&limits))
.run(|build| {
use metadata::BuildTargets;
use docsrs_metadata::BuildTargets;

let mut has_docs = false;
let mut successful_targets = Vec::new();
Expand Down Expand Up @@ -589,7 +588,7 @@ impl RustwideBuilder {
rustdoc_flags_extras: Vec<String>,
) -> Result<Command<'ws, 'pl>> {
// If the explicit target is not a tier one target, we need to install it.
if !metadata::DEFAULT_TARGETS.contains(&target) {
if !docsrs_metadata::DEFAULT_TARGETS.contains(&target) {
// This is a no-op if the target is already installed.
self.toolchain.add_target(&self.workspace, target)?;
}
Expand Down

0 comments on commit 02105e7

Please sign in to comment.