Skip to content

Commit

Permalink
Auto merge of #3051 - jtgeibel:revert-semver-bump, r=jtgeibel
Browse files Browse the repository at this point in the history
Revert "Auto merge of #2990 - jtgeibel:update/semver, r=pietroalbini"

This reverts commit cdf6915, reversing
changes made to 6e7b63a.

I'll r+ once CI is green
r? `@ghost`
  • Loading branch information
bors committed Nov 27, 2020
2 parents 7a23c2e + 0bcb724 commit ed99765
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 18 deletions.
19 changes: 5 additions & 14 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
Expand Up @@ -75,7 +75,7 @@ parse_link_header = "0.2.0"
rand = "0.7"
reqwest = { version = "0.10", features = ["blocking", "gzip", "json"] }
scheduled-thread-pool = "0.2.0"
semver = { version = "0.11", features = ["diesel", "serde"] }
semver = { version = "0.10", features = ["diesel", "serde"] }
sentry = "0.21.0"
serde = { version = "1.0.0", features = ["derive"] }
serde_json = "1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion src/models/dependency.rs
Expand Up @@ -92,7 +92,7 @@ pub fn add_dependencies(
.map_err(|_| cargo_err(&format_args!("no known crate named `{}`", &*dep.name)))?;
if dep.version_req == semver::VersionReq::parse("*").unwrap() {
return Err(cargo_err(
"wildcard (`*` or `>= 0`) dependency constraints are not allowed \
"wildcard (`*`) dependency constraints are not allowed \
on crates.io. See https://doc.rust-lang.org/cargo/faq.html#can-\
libraries-use--as-a-version-for-their-dependencies for more \
information",
Expand Down
1 change: 0 additions & 1 deletion src/tests/all.rs
Expand Up @@ -190,7 +190,6 @@ fn bad_resp(r: &mut AppResponse) -> Option<Bad> {
Some(bad)
}

#[track_caller]
fn json<T>(r: &mut AppResponse) -> T
where
for<'de> T: serde::Deserialize<'de>,
Expand Down
2 changes: 1 addition & 1 deletion src/tests/builders/dependency.rs
Expand Up @@ -15,7 +15,7 @@ impl DependencyBuilder {
explicit_name_in_toml: None,
name: name.to_string(),
registry: None,
version_req: u::EncodableCrateVersionReq(semver::VersionReq::parse("> 0").unwrap()),
version_req: u::EncodableCrateVersionReq(semver::VersionReq::parse(">= 0").unwrap()),
}
}

Expand Down

0 comments on commit ed99765

Please sign in to comment.