Skip to content

Commit 2846a72

Browse files
benev0lpil
authored andcommitted
update hexpm-rust to v5
1 parent b8594ac commit 2846a72

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ toml = "0"
2929
# Enum trait impl macros
3030
strum = { version = "0", features = ["derive"] }
3131
# Hex package manager client
32-
hexpm = "4"
32+
hexpm = "5"
3333
# Creation of tar file archives
3434
tar = "0"
3535
# gzip compression

compiler-cli/src/dependencies.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,13 +1183,13 @@ impl dependency::PackageFetcher for PackageFetcher {
11831183

11841184
tracing::debug!(package = package, "looking_up_hex_package");
11851185
let config = hexpm::Config::new();
1186-
let request = hexpm::get_package_request(package, None, &config);
1186+
let request = hexpm::repository_v2_get_package_request(package, None, &config);
11871187
let response = self
11881188
.runtime
11891189
.block_on(self.http.send(request))
11901190
.map_err(PackageFetchError::fetch_error)?;
11911191

1192-
let pkg = hexpm::get_package_response(response, HEXPM_PUBLIC_KEY)
1192+
let pkg = hexpm::repository_v2_get_package_response(response, HEXPM_PUBLIC_KEY)
11931193
.map_err(PackageFetchError::from)?;
11941194
let pkg = Rc::new(pkg);
11951195
let pkg_ref = Rc::clone(&pkg);

compiler-cli/src/docs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pub fn remove(package: String, version: String) -> Result<()> {
2929
let http = HttpClient::new();
3030

3131
// Remove docs from API
32-
let request = hexpm::remove_docs_request(&package, &version, &api_key, &hex_config)
32+
let request = hexpm::api_remove_docs_request(&package, &version, &api_key, &hex_config)
3333
.map_err(Error::hex)?;
3434
let response = runtime.block_on(http.send(request))?;
35-
hexpm::remove_docs_response(response).map_err(Error::hex)?;
35+
hexpm::api_remove_docs_response(response).map_err(Error::hex)?;
3636

3737
// Done!
3838
println!("The docs for {package} {version} have been removed from HexDocs");

compiler-cli/src/hex.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ pub fn revert(
8181
let http = HttpClient::new();
8282

8383
// Revert release from API
84-
let request = hexpm::revert_release_request(&package, &version, &api_key, &hex_config)
84+
let request = hexpm::api_revert_release_request(&package, &version, &api_key, &hex_config)
8585
.map_err(Error::hex)?;
8686
let response = runtime.block_on(http.send(request))?;
87-
hexpm::revert_release_response(response).map_err(Error::hex)?;
87+
hexpm::api_revert_release_response(response).map_err(Error::hex)?;
8888

8989
// Done!
9090
println!("{package} {version} has been removed from Hex");

compiler-core/src/hex.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ pub async fn publish_package<Http: HttpClient>(
3636
http: &Http,
3737
) -> Result<()> {
3838
tracing::info!("Publishing package, replace: {}", replace);
39-
let request = hexpm::publish_package_request(release_tarball, api_key, config, replace);
39+
let request = hexpm::api_publish_package_request(release_tarball, api_key, config, replace);
4040
let response = http.send(request).await?;
41-
hexpm::publish_package_response(response).map_err(|e| match e {
41+
hexpm::api_publish_package_response(response).map_err(|e| match e {
4242
ApiError::NotReplacing => Error::HexPublishReplaceRequired { version },
4343
err => Error::hex(err),
4444
})
@@ -57,9 +57,9 @@ pub async fn transfer_owner<Http: HttpClient>(
5757
new_owner_username_or_email
5858
);
5959
let request =
60-
hexpm::transfer_owner_request(&package_name, &new_owner_username_or_email, api_key, config);
60+
hexpm::api_transfer_owner_request(&package_name, &new_owner_username_or_email, api_key, config);
6161
let response = http.send(request).await?;
62-
hexpm::transfer_owner_response(response).map_err(Error::hex)
62+
hexpm::api_transfer_owner_response(response).map_err(Error::hex)
6363
}
6464

6565
#[derive(Debug, strum::EnumString, strum::VariantNames, Clone, Copy, PartialEq, Eq)]
@@ -94,7 +94,7 @@ pub async fn retire_release<Http: HttpClient>(
9494
http: &Http,
9595
) -> Result<()> {
9696
tracing::info!(package=%package, version=%version, "retiring_hex_release");
97-
let request = hexpm::retire_release_request(
97+
let request = hexpm::api_retire_release_request(
9898
package,
9999
version,
100100
reason.to_library_enum(),
@@ -103,7 +103,7 @@ pub async fn retire_release<Http: HttpClient>(
103103
config,
104104
);
105105
let response = http.send(request).await?;
106-
hexpm::retire_release_response(response).map_err(Error::hex)
106+
hexpm::api_retire_release_response(response).map_err(Error::hex)
107107
}
108108

109109
pub async fn unretire_release<Http: HttpClient>(
@@ -114,9 +114,9 @@ pub async fn unretire_release<Http: HttpClient>(
114114
http: &Http,
115115
) -> Result<()> {
116116
tracing::info!(package=%package, version=%version, "retiring_hex_release");
117-
let request = hexpm::unretire_release_request(package, version, api_key, config);
117+
let request = hexpm::api_unretire_release_request(package, version, api_key, config);
118118
let response = http.send(request).await?;
119-
hexpm::unretire_release_response(response).map_err(Error::hex)
119+
hexpm::api_unretire_release_response(response).map_err(Error::hex)
120120
}
121121

122122
pub async fn create_api_key<Http: HttpClient>(
@@ -127,9 +127,9 @@ pub async fn create_api_key<Http: HttpClient>(
127127
http: &Http,
128128
) -> Result<String> {
129129
tracing::info!("Creating API key with Hex");
130-
let request = hexpm::create_api_key_request(username, password, &key_name(hostname), config);
130+
let request = hexpm::api_create_api_key_request(username, password, &key_name(hostname), config);
131131
let response = http.send(request).await?;
132-
hexpm::create_api_key_response(response).map_err(Error::hex)
132+
hexpm::api_create_api_key_response(response).map_err(Error::hex)
133133
}
134134

135135
pub async fn remove_api_key<Http: HttpClient>(
@@ -139,9 +139,9 @@ pub async fn remove_api_key<Http: HttpClient>(
139139
http: &Http,
140140
) -> Result<()> {
141141
tracing::info!("Deleting API key from Hex");
142-
let request = hexpm::remove_api_key_request(&key_name(hostname), auth_key, config);
142+
let request = hexpm::api_remove_api_key_request(&key_name(hostname), auth_key, config);
143143
let response = http.send(request).await?;
144-
hexpm::remove_api_key_response(response).map_err(Error::hex)
144+
hexpm::api_remove_api_key_response(response).map_err(Error::hex)
145145
}
146146

147147
#[derive(Debug)]
@@ -201,7 +201,7 @@ impl Downloader {
201201
"downloading_package_to_cache"
202202
);
203203

204-
let request = hexpm::get_package_tarball_request(
204+
let request = hexpm::repository_get_package_tarball_request(
205205
&package.name,
206206
&package.version.to_string(),
207207
None,
@@ -210,7 +210,7 @@ impl Downloader {
210210
let response = self.http.send(request).await?;
211211

212212
let tarball =
213-
hexpm::get_package_tarball_response(response, &outer_checksum.0).map_err(|error| {
213+
hexpm::repository_get_package_tarball_response(response, &outer_checksum.0).map_err(|error| {
214214
Error::DownloadPackageError {
215215
package_name: package.name.to_string(),
216216
package_version: package.version.to_string(),
@@ -302,10 +302,10 @@ pub async fn publish_documentation<Http: HttpClient>(
302302
http: &Http,
303303
) -> Result<()> {
304304
tracing::info!("publishing_documentation");
305-
let request = hexpm::publish_docs_request(name, &version.to_string(), archive, api_key, config)
305+
let request = hexpm::api_publish_docs_request(name, &version.to_string(), archive, api_key, config)
306306
.map_err(Error::hex)?;
307307
let response = http.send(request).await?;
308-
hexpm::publish_docs_response(response).map_err(Error::hex)
308+
hexpm::api_publish_docs_response(response).map_err(Error::hex)
309309
}
310310

311311
pub async fn get_package_release<Http: HttpClient>(
@@ -320,7 +320,7 @@ pub async fn get_package_release<Http: HttpClient>(
320320
version = version.as_str(),
321321
"looking_up_package_release"
322322
);
323-
let request = hexpm::get_package_release_request(name, &version, None, config);
323+
let request = hexpm::api_get_package_release_request(name, &version, None, config);
324324
let response = http.send(request).await?;
325-
hexpm::get_package_release_response(response).map_err(Error::hex)
325+
hexpm::api_get_package_release_response(response).map_err(Error::hex)
326326
}

0 commit comments

Comments
 (0)