Skip to content

Commit ae15607

Browse files
authored
Merge pull request #7204 from Turbo87/links-from-tarball
publish: Use `links` field from embedded `Cargo.toml` file
2 parents ee5d28d + 88c009a commit ae15607

File tree

4 files changed

+2
-6
lines changed

4 files changed

+2
-6
lines changed

src/controllers/krate/publish.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
162162
conn.transaction(|conn| {
163163
let name = metadata.name;
164164
let vers = &*metadata.vers;
165-
let links = metadata.links;
166165
let features = metadata
167166
.features
168167
.into_iter()
@@ -238,7 +237,7 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
238237
content_length as i32,
239238
user.id,
240239
hex_cksum,
241-
links,
240+
package.links,
242241
rust_version,
243242
)?
244243
.save(conn, &verified_email_address)?;

src/tests/builders/publish.rs

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ impl PublishBuilder {
158158
.map(u::EncodableCategory)
159159
.collect(),
160160
),
161-
links: None,
162161
};
163162

164163
let mut tarball_builder = TarballBuilder::new();

src/tests/krate/publish/snapshots/all__krate__publish__categories__too_many_categories.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ expression: response.into_json()
55
{
66
"errors": [
77
{
8-
"detail": "invalid upload request: invalid length 6, expected at most 5 categories per crate at line 1 column 154"
8+
"detail": "invalid upload request: invalid length 6, expected at most 5 categories per crate at line 1 column 155"
99
}
1010
]
1111
}

src/views/krate_publish.rs

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ pub struct PublishMetadata {
2424
pub keywords: EncodableKeywordList,
2525
#[serde(default)]
2626
pub categories: EncodableCategoryList,
27-
#[serde(default)]
28-
pub links: Option<String>,
2927
}
3028

3129
#[derive(PartialEq, Eq, Hash, Serialize, Clone, Debug, Deref)]

0 commit comments

Comments
 (0)