Skip to content

Declare one-line files on one line, in test projects #5791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 25, 2018
Merged

Declare one-line files on one line, in test projects #5791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5659b78
Replace const BASIC_MANIFEST with basic_manifest("foo", "0.0.1")
dwijnand Jul 24, 2018
ab19c48
Dedup a bunch more manifest
dwijnand Jul 24, 2018
ca7d9ee
Declare one-line files on one line, in test projects
dwijnand Jul 25, 2018
6ca32be
Declare one-line write_all contents on one line, too
dwijnand Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions tests/testsuite/alt_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use support::ChannelChanger;
use support::registry::{self, alt_api_path, Package};
use support::{execs, paths, project};
use support::{basic_manifest, execs, paths, project};
use support::hamcrest::assert_that;
use std::fs::File;
use std::io::Write;
Expand Down Expand Up @@ -249,15 +249,7 @@ fn registry_and_path_dep_works() {
"#,
)
.file("src/main.rs", "fn main() {}")
.file(
"bar/Cargo.toml",
r#"
[project]
name = "bar"
version = "0.0.1"
authors = []
"#,
)
.file("bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("bar/src/lib.rs", "")
.build();

Expand Down
107 changes: 14 additions & 93 deletions tests/testsuite/bad_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use support::{execs, project};
use support::{basic_manifest, execs, project};
use support::registry::Package;
use support::hamcrest::assert_that;

Expand Down Expand Up @@ -598,36 +598,10 @@ Caused by:
#[test]
fn duplicate_deps() {
let p = project()
.file(
"shim-bar/Cargo.toml",
r#"
[package]
name = "bar"
version = "0.0.1"
authors = []
"#,
)
.file(
"shim-bar/src/lib.rs",
r#"
pub fn a() {}
"#,
)
.file(
"linux-bar/Cargo.toml",
r#"
[package]
name = "bar"
version = "0.0.1"
authors = []
"#,
)
.file(
"linux-bar/src/lib.rs",
r#"
pub fn a() {}
"#,
)
.file("shim-bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("shim-bar/src/lib.rs", "pub fn a() {}")
.file("linux-bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("linux-bar/src/lib.rs", "pub fn a() {}")
.file(
"Cargo.toml",
r#"
Expand Down Expand Up @@ -663,36 +637,10 @@ have a single canonical source path irrespective of build target.
#[test]
fn duplicate_deps_diff_sources() {
let p = project()
.file(
"shim-bar/Cargo.toml",
r#"
[package]
name = "bar"
version = "0.0.1"
authors = []
"#,
)
.file(
"shim-bar/src/lib.rs",
r#"
pub fn a() {}
"#,
)
.file(
"linux-bar/Cargo.toml",
r#"
[package]
name = "bar"
version = "0.0.1"
authors = []
"#,
)
.file(
"linux-bar/src/lib.rs",
r#"
pub fn a() {}
"#,
)
.file("shim-bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("shim-bar/src/lib.rs", "pub fn a() {}")
.file("linux-bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("linux-bar/src/lib.rs", "pub fn a() {}")
.file(
"Cargo.toml",
r#"
Expand Down Expand Up @@ -766,12 +714,7 @@ warning: unused manifest key: target.foo.bar
bulid = "foo"
"#,
)
.file(
"src/lib.rs",
r#"
pub fn foo() {}
"#,
)
.file("src/lib.rs", "pub fn foo() {}")
.build();
assert_that(
p.cargo("build"),
Expand All @@ -798,12 +741,7 @@ warning: unused manifest key: project.bulid
build = "foo"
"#,
)
.file(
"src/lib.rs",
r#"
pub fn foo() {}
"#,
)
.file("src/lib.rs", "pub fn foo() {}")
.build();
assert_that(
p.cargo("build"),
Expand All @@ -828,14 +766,7 @@ fn unused_keys_in_virtual_manifest() {
bulid = "foo"
"#,
)
.file(
"bar/Cargo.toml",
r#"
[project]
version = "0.0.1"
name = "bar"
"#,
)
.file("bar/Cargo.toml", &basic_manifest("bar", "0.0.1"))
.file("bar/src/lib.rs", r"")
.build();
assert_that(
Expand Down Expand Up @@ -884,12 +815,7 @@ to use. This will be considered an error in future versions
#[test]
fn invalid_toml_historically_allowed_is_warned() {
let p = project()
.file(
".cargo/config",
r#"
[bar] baz = 2
"#,
)
.file(".cargo/config", "[bar] baz = 2")
.file("src/main.rs", "fn main() {}")
.build();

Expand Down Expand Up @@ -947,12 +873,7 @@ This will be considered an error in future versions
fn bad_source_config1() {
let p = project()
.file("src/lib.rs", "")
.file(
".cargo/config",
r#"
[source.foo]
"#,
)
.file(".cargo/config", "[source.foo]")
.build();

assert_that(
Expand Down
Loading