Skip to content

Commit 55c7386

Browse files
jyn514jyn514
authored
Merge pull request rust-lang#1361 from jyn514/cratesfyi
Remove more references to cratesfyi
2 parents 5195cdc + 647e494 commit 55c7386

File tree

20 files changed

+63
-69
lines changed

20 files changed

+63
-69
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,14 +185,14 @@ cargo run -- build crate --local /path/to/source
185185

186186
```sh
187187
# Adds a directory into database to serve with `staticfile` crate.
188-
docker-compose run -- database add-directory <DIRECTORY> [PREFIX]
188+
cargo run -- database add-directory <DIRECTORY> [PREFIX]
189189

190190
# Updates github stats for crates.
191191
# You need to set CRATESFYI_GITHUB_USERNAME, CRATESFYI_GITHUB_ACCESSTOKEN
192192
# environment variables in order to run this command.
193193
# Set DOCSRS_GITLAB_ACCESSTOKEN to raise the rate limit,
194194
# or leave it blank to fetch repositories at a slower rate.
195-
# You can set this environment variables in ~/.cratesfyi.env file.
195+
# You can set this environment variables in the .env file.
196196
cargo run -- database update-repository-fields
197197
```
198198

‎crates/metadata/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ mod test_parsing {
323323
use std::str::FromStr;
324324

325325
#[test]
326-
fn test_cratesfyi_metadata() {
326+
fn test_docsrs_metadata() {
327327
let manifest = r#"
328328
[package]
329329
name = "test"

‎src/bin/cratesfyi.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ enum CommandLine {
7979
reload_templates: bool,
8080
},
8181

82-
/// Starts cratesfyi daemon
82+
/// Starts the daemon
8383
Daemon {
8484
/// Deprecated. Run the server in the foreground instead of detaching a child
8585
#[structopt(name = "FOREGROUND", short = "f", long = "foreground")]
@@ -278,10 +278,10 @@ enum BuildSubcommand {
278278
/// Adds essential files for the installed version of rustc
279279
AddEssentialFiles,
280280

281-
/// Locks cratesfyi daemon to stop building new crates
281+
/// Locks the daemon, preventing it from building new crates
282282
Lock,
283283

284-
/// Unlocks cratesfyi daemon to continue building new crates
284+
/// Unlocks the daemon to continue building new crates
285285
Unlock,
286286
}
287287

‎src/db/add_package.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ pub(crate) fn add_build_into_database(
172172
) -> Result<i32> {
173173
debug!("Adding build into database");
174174
let rows = conn.query(
175-
"INSERT INTO builds (rid, rustc_version, cratesfyi_version, build_status)
175+
"INSERT INTO builds (rid, rustc_version, docsrs_version, build_status)
176176
VALUES ($1, $2, $3, $4)
177177
RETURNING id",
178178
&[

‎src/db/migrate.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//! Database migrations
22
3-
use crate::error::Result as CratesfyiResult;
43
use log::info;
54
use postgres::{Client, Error as PostgresError, Transaction};
65
use schemamama::{Migration, Migrator, Version};
@@ -50,7 +49,7 @@ macro_rules! migration {
5049
}};
5150
}
5251

53-
pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<()> {
52+
pub fn migrate(version: Option<Version>, conn: &mut Client) -> crate::error::Result<()> {
5453
conn.execute(
5554
"CREATE TABLE IF NOT EXISTS database_versions (version BIGINT PRIMARY KEY);",
5655
&[],
@@ -730,7 +729,12 @@ pub fn migrate(version: Option<Version>, conn: &mut Client) -> CratesfyiResult<(
730729
DROP COLUMN repository_id;
731730
732731
DROP TABLE repositories;
733-
"
732+
",
733+
),
734+
migration!(
735+
context, 29, "Rename cratesfyi_version to docsrs_version",
736+
"ALTER TABLE builds RENAME COLUMN cratesfyi_version TO docsrs_version",
737+
"ALTER TABLE builds RENAME COLUMN docsrs_version TO cratesfyi_version",
734738
),
735739
];
736740

‎src/docbuilder/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ impl DocBuilder {
3131
}
3232

3333
fn lock_path(&self) -> PathBuf {
34-
self.config.prefix.join("cratesfyi.lock")
34+
self.config.prefix.join("docsrs.lock")
3535
}
3636

3737
/// Creates a lock file. Daemon will check this lock file and stop operating if its exists.

‎src/docbuilder/rustwide_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ impl RustwideBuilder {
613613
// this is allowing us to host documents in the root of the crate documentation directory.
614614
// for example winapi will be available in docs.rs/winapi/$version/winapi/ for it's
615615
// default target: x86_64-pc-windows-msvc. But since it will be built under
616-
// cratesfyi/x86_64-pc-windows-msvc we still need target in this function.
616+
// target/x86_64-pc-windows-msvc we still need target in this function.
617617
if !is_default_target {
618618
dest = dest.join(target);
619619
}

‎src/repositories/updater.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -326,16 +326,16 @@ mod test {
326326

327327
// gitlab checks
328328
assert_name(
329-
"https://gitlab.com/onur/cratesfyi",
330-
("onur", "cratesfyi", "gitlab.com"),
329+
"https://gitlab.com/pythondude325/hexponent",
330+
("pythondude325", "hexponent", "gitlab.com"),
331331
);
332332
assert_name(
333-
"http://gitlab.com/onur/cratesfyi",
334-
("onur", "cratesfyi", "gitlab.com"),
333+
"http://gitlab.com/pythondude325/hexponent",
334+
("pythondude325", "hexponent", "gitlab.com"),
335335
);
336336
assert_name(
337-
"https://gitlab.com/onur/cratesfyi.git",
338-
("onur", "cratesfyi", "gitlab.com"),
337+
"https://gitlab.com/pythondude325/hexponent.git",
338+
("pythondude325", "hexponent", "gitlab.com"),
339339
);
340340
assert_name(
341341
"https://gitlab.com/docopt/docopt.rs",
@@ -361,16 +361,16 @@ mod test {
361361

362362
// github checks
363363
assert_name(
364-
"https://github.com/onur/cratesfyi",
365-
("onur", "cratesfyi", "github.com"),
364+
"https://github.com/rust-lang/rust",
365+
("rust-lang", "rust", "github.com"),
366366
);
367367
assert_name(
368-
"http://github.com/onur/cratesfyi",
369-
("onur", "cratesfyi", "github.com"),
368+
"http://github.com/rust-lang/rust",
369+
("rust-lang", "rust", "github.com"),
370370
);
371371
assert_name(
372-
"https://github.com/onur/cratesfyi.git",
373-
("onur", "cratesfyi", "github.com"),
372+
"https://github.com/rust-lang/rust.git",
373+
("rust-lang", "rust", "github.com"),
374374
);
375375
assert_name(
376376
"https://github.com/docopt/docopt.rs",

‎src/utils/copy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ mod test {
2626
#[test]
2727
fn test_copy_doc_dir() {
2828
let source = tempfile::Builder::new()
29-
.prefix("cratesfyi-src")
29+
.prefix("docsrs-src")
3030
.tempdir()
3131
.unwrap();
3232
let destination = tempfile::Builder::new()
33-
.prefix("cratesfyi-dst")
33+
.prefix("docsrs-dst")
3434
.tempdir()
3535
.unwrap();
3636
let doc = source.path().join("doc");

‎src/utils/queue.rs

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,16 @@ mod tests {
5656
wrapper(|env| {
5757
let db = env.db();
5858

59-
set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
59+
set_crate_priority(&mut db.conn(), "docsrs-%", -100)?;
60+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-database")?, -100);
61+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-")?, -100);
62+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-s3")?, -100);
6063
assert_eq!(
61-
get_crate_priority(&mut db.conn(), "cratesfyi-database")?,
64+
get_crate_priority(&mut db.conn(), "docsrs-webserver")?,
6265
-100
6366
);
64-
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
65-
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-s3")?, -100);
6667
assert_eq!(
67-
get_crate_priority(&mut db.conn(), "cratesfyi-webserver")?,
68-
-100
69-
);
70-
assert_eq!(
71-
get_crate_priority(&mut db.conn(), "cratesfyi")?,
68+
get_crate_priority(&mut db.conn(), "docsrs")?,
7269
DEFAULT_PRIORITY
7370
);
7471

@@ -96,15 +93,15 @@ mod tests {
9693
wrapper(|env| {
9794
let db = env.db();
9895

99-
set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
100-
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
96+
set_crate_priority(&mut db.conn(), "docsrs-%", -100)?;
97+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-")?, -100);
10198

10299
assert_eq!(
103-
remove_crate_priority(&mut db.conn(), "cratesfyi-%")?,
100+
remove_crate_priority(&mut db.conn(), "docsrs-%")?,
104101
Some(-100)
105102
);
106103
assert_eq!(
107-
get_crate_priority(&mut db.conn(), "cratesfyi-")?,
104+
get_crate_priority(&mut db.conn(), "docsrs-")?,
108105
DEFAULT_PRIORITY
109106
);
110107

@@ -117,16 +114,13 @@ mod tests {
117114
wrapper(|env| {
118115
let db = env.db();
119116

120-
set_crate_priority(&mut db.conn(), "cratesfyi-%", -100)?;
117+
set_crate_priority(&mut db.conn(), "docsrs-%", -100)?;
121118

119+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-database")?, -100);
120+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-")?, -100);
121+
assert_eq!(get_crate_priority(&mut db.conn(), "docsrs-s3")?, -100);
122122
assert_eq!(
123-
get_crate_priority(&mut db.conn(), "cratesfyi-database")?,
124-
-100
125-
);
126-
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-")?, -100);
127-
assert_eq!(get_crate_priority(&mut db.conn(), "cratesfyi-s3")?, -100);
128-
assert_eq!(
129-
get_crate_priority(&mut db.conn(), "cratesfyi-webserver")?,
123+
get_crate_priority(&mut db.conn(), "docsrs-webserver")?,
130124
-100
131125
);
132126
assert_eq!(
@@ -144,7 +138,7 @@ mod tests {
144138
let db = env.db();
145139

146140
assert_eq!(
147-
get_crate_priority(&mut db.conn(), "cratesfyi")?,
141+
get_crate_priority(&mut db.conn(), "docsrs")?,
148142
DEFAULT_PRIORITY
149143
);
150144
assert_eq!(get_crate_priority(&mut db.conn(), "rcc")?, DEFAULT_PRIORITY);

‎src/utils/rustc_version.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn test_parse_rustc_version() {
2626
"20160523-1.10.0-nightly-57ef01513"
2727
);
2828
assert_eq!(
29-
parse_rustc_version("cratesfyi 0.2.0 (ba9ae23 2016-05-26)").unwrap(),
29+
parse_rustc_version("docsrs 0.2.0 (ba9ae23 2016-05-26)").unwrap(),
3030
"20160526-0.2.0-ba9ae23"
3131
);
3232
}

‎src/web/build_details.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
4444
conn.query_opt(
4545
"SELECT
4646
builds.rustc_version,
47-
builds.cratesfyi_version,
47+
builds.docsrs_version,
4848
builds.build_status,
4949
builds.build_time,
5050
builds.output,
@@ -69,7 +69,7 @@ pub fn build_details_handler(req: &mut Request) -> IronResult<Response> {
6969
BuildDetails {
7070
id,
7171
rustc_version: row.get("rustc_version"),
72-
docsrs_version: row.get("cratesfyi_version"),
72+
docsrs_version: row.get("docsrs_version"),
7373
build_status: row.get("build_status"),
7474
build_time: row.get("build_time"),
7575
output,

‎src/web/builds.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
8080
releases.target_name,
8181
builds.id,
8282
builds.rustc_version,
83-
builds.cratesfyi_version,
83+
builds.docsrs_version,
8484
builds.build_status,
8585
builds.build_time
8686
FROM builds
@@ -97,7 +97,7 @@ pub fn build_list_handler(req: &mut Request) -> IronResult<Response> {
9797
.map(|row| Build {
9898
id: row.get("id"),
9999
rustc_version: row.get("rustc_version"),
100-
docsrs_version: row.get("cratesfyi_version"),
100+
docsrs_version: row.get("docsrs_version"),
101101
build_status: row.get("build_status"),
102102
build_time: row.get("build_time"),
103103
})

‎src/web/mod.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ const STATIC_FILE_CACHE_DURATION: u64 = 60 * 60 * 24 * 30 * 12; // 12 months
119119

120120
const DEFAULT_BIND: &str = "0.0.0.0:3000";
121121

122-
struct CratesfyiHandler {
122+
struct MainHandler {
123123
shared_resource_handler: Box<dyn Handler>,
124124
router_handler: Box<dyn Handler>,
125125
inject_extensions: InjectExtensions,
126126
}
127127

128-
impl CratesfyiHandler {
128+
impl MainHandler {
129129
fn chain<H: Handler>(inject_extensions: InjectExtensions, base: H) -> Chain {
130130
let mut chain = Chain::new(base);
131131
chain.link_before(inject_extensions);
@@ -136,26 +136,23 @@ impl CratesfyiHandler {
136136
chain
137137
}
138138

139-
fn new(
140-
template_data: Arc<TemplateData>,
141-
context: &dyn Context,
142-
) -> Result<CratesfyiHandler, Error> {
139+
fn new(template_data: Arc<TemplateData>, context: &dyn Context) -> Result<MainHandler, Error> {
143140
let inject_extensions = InjectExtensions::new(context, template_data)?;
144141

145142
let routes = routes::build_routes();
146143
let shared_resources =
147144
Self::chain(inject_extensions.clone(), rustdoc::SharedResourceHandler);
148145
let router_chain = Self::chain(inject_extensions.clone(), routes.iron_router());
149146

150-
Ok(CratesfyiHandler {
147+
Ok(MainHandler {
151148
shared_resource_handler: Box::new(shared_resources),
152149
router_handler: Box::new(router_chain),
153150
inject_extensions,
154151
})
155152
}
156153
}
157154

158-
impl Handler for CratesfyiHandler {
155+
impl Handler for MainHandler {
159156
fn handle(&self, req: &mut Request) -> IronResult<Response> {
160157
fn if_404(
161158
e: IronError,
@@ -438,8 +435,7 @@ impl Server {
438435
template_data: Arc<TemplateData>,
439436
context: &dyn Context,
440437
) -> Result<Self, Error> {
441-
let cratesfyi = CratesfyiHandler::new(template_data, context)?;
442-
let mut iron = Iron::new(cratesfyi);
438+
let mut iron = Iron::new(MainHandler::new(template_data, context)?);
443439
if cfg!(test) {
444440
iron.threads = 1;
445441
}

‎templates/about-base.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "base.html" %}
22

33
{% block header %}
4-
<div class="cratesfyi-package-container">
4+
<div class="docsrs-package-container">
55
<div class="container">
66
<div class="description-container">
77
<h1 id="crate-title" class="no-description">Docs.rs documentation</h1>

‎templates/error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%- extends "base.html" -%}
22

33
{%- block header -%}
4-
<div class="cratesfyi-package-container">
4+
<div class="docsrs-package-container">
55
<div class="container">
66
<h1 id="crate-title">{{ title }}</h1>
77
</div>

‎templates/header/package_navigation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
and tera requires all parameters without defaults to be filled
1414
#}
1515
{% macro package_navigation(title=false, metadata, active_tab) %}
16-
<div class="cratesfyi-package-container">
16+
<div class="docsrs-package-container">
1717
<div class="container">
1818
<div class="description-container">
1919
{# The partial path of the crate, `:name/:release` #}

‎templates/releases/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* `owner` A string, used for the owners page
1313
#}
1414
{% macro header(title, description, tab, owner=false) %}
15-
<div class="cratesfyi-package-container">
15+
<div class="docsrs-package-container">
1616
<div class="container">
1717
<div class="description-container">
1818
<h1 id="crate-title">{{ title }}</h1>

‎templates/style/base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ div.package-page-container {
539539
}
540540
}
541541

542-
div.cratesfyi-package-container {
542+
div.docsrs-package-container {
543543
text-align: left;
544544
background-color: var(--color-background-code);
545545
border-bottom: 1px solid var(--color-border);

‎templates/style/rustdoc.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body.blur {
1919
}
2020

2121
> div.nav-container > *,
22-
> div.cratesfyi-package-container > *,
22+
> div.docsrs-package-container > *,
2323
> div.rustdoc > :not(#help) {
2424
filter: blur(8px);
2525
-webkit-filter: blur(8px);

0 commit comments

Comments
 (0)