mirror of
https://github.com/rust-lang/cargo
synced 2024-08-25 10:35:53 +00:00
Remove unnecessary calls to masquerade_as_nightly_cargo.
These are not needed anymore.
This commit is contained in:
parent
6fc356e556
commit
87449f453b
|
@ -1141,7 +1141,6 @@ fn doc_edition() {
|
|||
.file(
|
||||
"Cargo.toml",
|
||||
r#"
|
||||
cargo-features = ["edition"]
|
||||
[package]
|
||||
name = "foo"
|
||||
version = "0.0.1"
|
||||
|
@ -1153,12 +1152,10 @@ fn doc_edition() {
|
|||
.build();
|
||||
|
||||
p.cargo("doc -v")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
|
||||
.run();
|
||||
|
||||
p.cargo("test -v")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
|
||||
.run();
|
||||
}
|
||||
|
@ -1169,7 +1166,6 @@ fn doc_target_edition() {
|
|||
.file(
|
||||
"Cargo.toml",
|
||||
r#"
|
||||
cargo-features = ["edition"]
|
||||
[package]
|
||||
name = "foo"
|
||||
version = "0.0.1"
|
||||
|
@ -1183,12 +1179,10 @@ fn doc_target_edition() {
|
|||
.build();
|
||||
|
||||
p.cargo("doc -v")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
|
||||
.run();
|
||||
|
||||
p.cargo("test -v")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_stderr_contains("[RUNNING] `rustdoc [..]--edition=2018[..]")
|
||||
.run();
|
||||
}
|
||||
|
|
|
@ -28,5 +28,5 @@ fn edition_works_for_build_script() {
|
|||
.file("a/src/lib.rs", "pub fn foo() {}")
|
||||
.build();
|
||||
|
||||
p.cargo("build -v").masquerade_as_nightly_cargo().run();
|
||||
p.cargo("build -v").run();
|
||||
}
|
||||
|
|
|
@ -930,9 +930,7 @@ fn fix_idioms() {
|
|||
fn idioms_2015_ok() {
|
||||
let p = project().file("src/lib.rs", "").build();
|
||||
|
||||
p.cargo("fix --edition-idioms --allow-no-vcs")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.run();
|
||||
p.cargo("fix --edition-idioms --allow-no-vcs").run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
@ -780,8 +780,6 @@ fn installs_from_cwd_with_2018_warnings() {
|
|||
.file(
|
||||
"Cargo.toml",
|
||||
r#"
|
||||
cargo-features = ["edition"]
|
||||
|
||||
[package]
|
||||
name = "foo"
|
||||
version = "0.1.0"
|
||||
|
@ -793,7 +791,6 @@ fn installs_from_cwd_with_2018_warnings() {
|
|||
.build();
|
||||
|
||||
p.cargo("install")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_status(101)
|
||||
.with_stderr_contains(
|
||||
"error: Using `cargo install` to install the binaries for the \
|
||||
|
|
|
@ -1208,8 +1208,6 @@ fn package_edition_2018() {
|
|||
.file(
|
||||
"Cargo.toml",
|
||||
r#"
|
||||
cargo-features = ["edition"]
|
||||
|
||||
[package]
|
||||
name = "foo"
|
||||
version = "0.1.0"
|
||||
|
@ -1219,7 +1217,6 @@ fn package_edition_2018() {
|
|||
)
|
||||
.build();
|
||||
p.cargo("metadata")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_json(
|
||||
r#"
|
||||
{
|
||||
|
@ -1291,8 +1288,6 @@ fn target_edition_2018() {
|
|||
.file(
|
||||
"Cargo.toml",
|
||||
r#"
|
||||
cargo-features = ["edition"]
|
||||
|
||||
[package]
|
||||
name = "foo"
|
||||
version = "0.1.0"
|
||||
|
@ -1305,7 +1300,6 @@ fn target_edition_2018() {
|
|||
)
|
||||
.build();
|
||||
p.cargo("metadata")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_json(
|
||||
r#"
|
||||
{
|
||||
|
@ -1389,8 +1383,6 @@ fn rename_dependency() {
|
|||
.file(
|
||||
"Cargo.toml",
|
||||
r#"
|
||||
cargo-features = ["rename-dependency"]
|
||||
|
||||
[project]
|
||||
name = "foo"
|
||||
version = "0.0.1"
|
||||
|
@ -1405,7 +1397,6 @@ fn rename_dependency() {
|
|||
.build();
|
||||
|
||||
p.cargo("metadata")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_json(
|
||||
r#"
|
||||
{
|
||||
|
|
|
@ -795,9 +795,7 @@ fn generated_manifest() {
|
|||
.file("bar/src/lib.rs", "")
|
||||
.build();
|
||||
|
||||
p.cargo("package --no-verify")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.run();
|
||||
p.cargo("package --no-verify").run();
|
||||
|
||||
let f = File::open(&p.root().join("target/package/foo-0.0.1.crate")).unwrap();
|
||||
let rewritten_toml = format!(
|
||||
|
@ -949,11 +947,6 @@ fn test_edition() {
|
|||
.build();
|
||||
|
||||
p.cargo("build -v")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.without_status() // passes on nightly, fails on stable, b/c --edition is nightly-only
|
||||
// --edition is still in flux and we're not passing -Zunstable-options
|
||||
// from Cargo so it will probably error. Only partially match the output
|
||||
// until stuff stabilizes
|
||||
.with_stderr_contains(
|
||||
"\
|
||||
[COMPILING] foo v0.0.1 ([..])
|
||||
|
@ -1086,9 +1079,7 @@ fn package_with_select_features() {
|
|||
)
|
||||
.build();
|
||||
|
||||
p.cargo("package --features required")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.run();
|
||||
p.cargo("package --features required").run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
@ -1117,9 +1108,7 @@ fn package_with_all_features() {
|
|||
)
|
||||
.build();
|
||||
|
||||
p.cargo("package --all-features")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.run();
|
||||
p.cargo("package --all-features").run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
@ -1149,7 +1138,6 @@ fn package_no_default_features() {
|
|||
.build();
|
||||
|
||||
p.cargo("package --no-default-features")
|
||||
.masquerade_as_nightly_cargo()
|
||||
.with_stderr_contains("error: This crate requires `required` feature!")
|
||||
.with_status(101)
|
||||
.run();
|
||||
|
|
|
@ -122,7 +122,7 @@ fn lots_of_names() {
|
|||
.file("foo/src/lib.rs", "pub fn foo4() {}")
|
||||
.build();
|
||||
|
||||
p.cargo("build -v").masquerade_as_nightly_cargo().run();
|
||||
p.cargo("build -v").run();
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
Loading…
Reference in a new issue