Skip to content

Commit 3227546

Browse files
rillianrillian
committed
Linewrap the error message from check_metadata.
This lets test result expected output pass the long-line style check.
1 parent 4f01c02 commit 3227546

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

‎src/cargo/ops/cargo_package.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ fn check_metadata(pkg: &Package, config: &Config) -> CargoResult<()> {
114114
things.push_str(&missing.last().unwrap());
115115

116116
try!(config.shell().warn(
117-
&format!("manifest has no {things}. \
117+
&format!("manifest has no {things}.\n\
118118
See http://doc.crates.io/manifest.html#package-metadata for more info.",
119119
things = things)))
120120
}

‎tests/package.rs

+15-5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ fn simple() {
3737
assert_that(p.cargo_process("package"),
3838
execs().with_status(0).with_stderr(&format!("\
3939
[WARNING] manifest has no documentation[..]
40+
See [..]
4041
[PACKAGING] foo v0.0.1 ({dir})
4142
[VERIFYING] foo v0.0.1 ({dir})
4243
[COMPILING] foo v0.0.1 ({dir}[..])
@@ -82,8 +83,8 @@ fn metadata_warning() {
8283
assert_that(p.cargo_process("package"),
8384
execs().with_status(0).with_stderr(&format!("\
8485
warning: manifest has no description, license, license-file, documentation, \
85-
homepage or repository. See \
86-
http://doc.crates.io/manifest.html#package-metadata for more info.
86+
homepage or repository.
87+
See http://doc.crates.io/manifest.html#package-metadata for more info.
8788
[PACKAGING] foo v0.0.1 ({dir})
8889
[VERIFYING] foo v0.0.1 ({dir})
8990
[COMPILING] foo v0.0.1 ({dir}[..])
@@ -104,8 +105,8 @@ http://doc.crates.io/manifest.html#package-metadata for more info.
104105
"#);
105106
assert_that(p.cargo_process("package"),
106107
execs().with_status(0).with_stderr(&format!("\
107-
warning: manifest has no description, documentation, homepage or repository. See \
108-
http://doc.crates.io/manifest.html#package-metadata for more info.
108+
warning: manifest has no description, documentation, homepage or repository.
109+
See http://doc.crates.io/manifest.html#package-metadata for more info.
109110
[PACKAGING] foo v0.0.1 ({dir})
110111
[VERIFYING] foo v0.0.1 ({dir})
111112
[COMPILING] foo v0.0.1 ({dir}[..])
@@ -165,6 +166,7 @@ fn package_verbose() {
165166
assert_that(cargo.clone().arg("package").arg("-v").arg("--no-verify"),
166167
execs().with_status(0).with_stderr("\
167168
[WARNING] manifest has no description[..]
169+
See http://doc.crates.io/manifest.html#package-metadata for more info.
168170
[PACKAGING] foo v0.0.1 ([..])
169171
[ARCHIVING] [..]
170172
[ARCHIVING] [..]
@@ -175,6 +177,7 @@ fn package_verbose() {
175177
.cwd(p.root().join("a")),
176178
execs().with_status(0).with_stderr("\
177179
[WARNING] manifest has no description[..]
180+
See http://doc.crates.io/manifest.html#package-metadata for more info.
178181
[PACKAGING] a v0.0.1 ([..])
179182
[ARCHIVING] [..]
180183
[ARCHIVING] [..]
@@ -198,6 +201,7 @@ fn package_verification() {
198201
assert_that(p.cargo("package"),
199202
execs().with_status(0).with_stderr(&format!("\
200203
[WARNING] manifest has no description[..]
204+
See http://doc.crates.io/manifest.html#package-metadata for more info.
201205
[PACKAGING] foo v0.0.1 ({dir})
202206
[VERIFYING] foo v0.0.1 ({dir})
203207
[COMPILING] foo v0.0.1 ({dir}[..])
@@ -231,7 +235,8 @@ fn path_dependency_no_version() {
231235

232236
assert_that(p.cargo_process("package"),
233237
execs().with_status(101).with_stderr("\
234-
[WARNING] manifest has no documentation, homepage or repository. See http://doc.crates.io/manifest.html#package-metadata for more info.
238+
[WARNING] manifest has no documentation, homepage or repository.
239+
See http://doc.crates.io/manifest.html#package-metadata for more info.
235240
[ERROR] all path dependencies must have a version specified when packaging.
236241
dependency `bar` does not specify a version.
237242
"));
@@ -256,6 +261,7 @@ fn exclude() {
256261
assert_that(p.cargo_process("package").arg("--no-verify").arg("-v"),
257262
execs().with_status(0).with_stderr("\
258263
[WARNING] manifest has no description[..]
264+
See http://doc.crates.io/manifest.html#package-metadata for more info.
259265
[PACKAGING] foo v0.0.1 ([..])
260266
[ARCHIVING] [..]
261267
[ARCHIVING] [..]
@@ -282,6 +288,7 @@ fn include() {
282288
assert_that(p.cargo_process("package").arg("--no-verify").arg("-v"),
283289
execs().with_status(0).with_stderr("\
284290
[WARNING] manifest has no description[..]
291+
See http://doc.crates.io/manifest.html#package-metadata for more info.
285292
[PACKAGING] foo v0.0.1 ([..])
286293
[ARCHIVING] [..]
287294
[ARCHIVING] [..]
@@ -391,6 +398,7 @@ fn ignore_nested() {
391398
assert_that(p.cargo_process("package"),
392399
execs().with_status(0).with_stderr(&format!("\
393400
[WARNING] manifest has no documentation[..]
401+
See http://doc.crates.io/manifest.html#package-metadata for more info.
394402
[PACKAGING] nested v0.0.1 ({dir})
395403
[VERIFYING] nested v0.0.1 ({dir})
396404
[COMPILING] nested v0.0.1 ({dir}[..])
@@ -439,6 +447,7 @@ fn package_weird_characters() {
439447
assert_that(p.cargo_process("package"),
440448
execs().with_status(101).with_stderr("\
441449
warning: [..]
450+
See [..]
442451
[PACKAGING] foo [..]
443452
[ERROR] failed to prepare local package for uploading
444453
@@ -479,6 +488,7 @@ fn repackage_on_source_change() {
479488
// Check that cargo rebuilds the tarball
480489
assert_that(pro, execs().with_status(0).with_stderr(&format!("\
481490
[WARNING] [..]
491+
See [..]
482492
[PACKAGING] foo v0.0.1 ({dir})
483493
[VERIFYING] foo v0.0.1 ({dir})
484494
[COMPILING] foo v0.0.1 ({dir}[..])

‎tests/publish.rs

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ fn simple() {
6060
execs().with_status(0).with_stderr(&format!("\
6161
[UPDATING] registry `{reg}`
6262
[WARNING] manifest has no documentation, [..]
63+
See [..]
6364
[PACKAGING] foo v0.0.1 ({dir})
6465
[UPLOADING] foo v0.0.1 ({dir})
6566
",
@@ -357,6 +358,7 @@ fn dry_run() {
357358
execs().with_status(0).with_stderr(&format!("\
358359
[UPDATING] registry `[..]`
359360
[WARNING] manifest has no documentation, [..]
361+
See [..]
360362
[PACKAGING] foo v0.0.1 ({dir})
361363
[VERIFYING] foo v0.0.1 ({dir})
362364
[COMPILING] foo v0.0.1 [..]

0 commit comments

Comments
 (0)