Skip to content

Commit 3b9594c

Browse files
committed
Prep for semver bump and document current blocker
This (partially) reverts commit 0bcb724. This partially reverts the revert (#3051) of #2990. While we can't bump the version yet, it is worth recovering these changes and documenting the remaining work.
1 parent 575b2fb commit 3b9594c

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ parking_lot = "0.11"
7272
rand = "0.7"
7373
reqwest = { version = "0.11", features = ["blocking", "gzip", "json"] }
7474
scheduled-thread-pool = "0.2.0"
75-
semver = { version = "0.10", features = ["diesel", "serde"] }
75+
semver = { version = "0.10", features = ["diesel", "serde"] } # TODO: Bump to 0.11 after steveklabnik/semver#217 is resolved
7676
sentry = "0.22"
7777
serde = { version = "1.0.0", features = ["derive"] }
7878
serde_json = "1.0.0"

src/controllers/krate/publish.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ pub const MISSING_RIGHTS_ERROR_MESSAGE: &str =
2525
to accept an invitation to be an owner before \
2626
publishing.";
2727

28-
pub const WILDCARD_ERROR_MESSAGE: &str = "wildcard (`*`) dependency constraints are not allowed \
28+
pub const WILDCARD_ERROR_MESSAGE: &str =
29+
"wildcard (`*` or `>= 0`) dependency constraints are not allowed \
2930
on crates.io. See https://doc.rust-lang.org/cargo/faq.html#can-\
3031
libraries-use--as-a-version-for-their-dependencies for more \
3132
information";

src/tests/all.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ fn env(var: &str) -> String {
178178
}
179179
}
180180

181+
#[track_caller]
181182
fn json<T>(r: &mut AppResponse) -> T
182183
where
183184
for<'de> T: serde::Deserialize<'de>,

0 commit comments

Comments
 (0)