Reverted the "kind" field to the previous value.

[KalitaAlexey]

Added a new field named "crate_types".
Fixes #3654
After this PR cargo metadata would output:

{
    "packages": [
        {
            "targets": [
                {
                    "kind": ["lib"],
                    "crate_types": ["lib"]
                },
                {
                    "kind": ["example"],
                    "crate_types": ["staticlib"]
                }
            ]
        }
    ]
}

I have added tests.

[rust-highfive]

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

[alexcrichton]

I believe previously kind for something like crate-type = ["rlib", "dylib"] would be ["rlib", "dylib"], right? Could we preserve that part (odd though it may be) as well?

[KalitaAlexey]

@alexcrichton,
That wasn't changed.

[KalitaAlexey]

I will fix it.

[alexcrichton]

@KalitaAlexey yes, it was changed. If you make a small example library with two crate-types, metadata prints this

"kind" : [
   "rlib",
   "dylib"
]

[KalitaAlexey]

@alexcrichton,
I have tests, which tell you are not right, but I will check it.

[KalitaAlexey]

@alexcrichton,
Something wrong.
Hm.
I did:

git pull upstream master
cargo test

I got:

failures:

---- finds_author_email stdout ----
        running `D:\Projects\Rust\cargo\target\debug\cargo new foo`
thread 'finds_author_email' panicked at 'assertion failed: contents.contains(r#"authors = ["bar <baz>"]"#)', tests\new.rs:314
note: Run with `RUST_BACKTRACE=1` for a backtrace.

---- finds_author_user stdout ----
        running `D:\Projects\Rust\cargo\target\debug\cargo new foo`
thread 'finds_author_user' panicked at 'assertion failed: contents.contains(r#"authors = ["foo"]"#)', tests\new.rs:246

---- finds_author_user_escaped stdout ----
        running `D:\Projects\Rust\cargo\target\debug\cargo new foo`
thread 'finds_author_user_escaped' panicked at 'assertion failed: contents.contains(r#"authors = ["foo \"bar\""]"#)', tests\new.rs:261

---- finds_author_username stdout ----
        running `D:\Projects\Rust\cargo\target\debug\cargo new foo`
thread 'finds_author_username' panicked at 'assertion failed: contents.contains(r#"authors = ["foo"]"#)', tests\new.rs:278

---- finds_git_author stdout ----
        running `D:\Projects\Rust\cargo\target\debug\cargo new foo`
thread 'finds_git_author' panicked at 'assertion failed: contents.contains(r#"authors = ["gitfoo"]"#)', tests\new.rs:362


failures:
    finds_author_email
    finds_author_user
    finds_author_user_escaped
    finds_author_username
    finds_git_author

test result: FAILED. 22 passed; 5 failed; 0 ignored; 0 measured

[KalitaAlexey]

@alexcrichton,
The test checks what you asked.

[alexcrichton]

As I mentioned before, we'll need to preserve the existing stable semantics of cargo metadata (the purpose of this change). To that end the kind entry may need to be an array of crate types actually for libraries. Does that make sense?

[KalitaAlexey]

@alexcrichton,
I am sorry, but I can't figure out what you are telling me.

[alexcrichton]

Currently this PR will emit at most one entry in the array of the kind field, but contrast that with:

cargo +stable new foo
cd foo
cat >> Cargo.toml <<-EOF
[lib]
crate-type = ["lib", "dylib"]
EOF
cargo +stable metadata | json_pp | grep -A 3 kind

That prints:

"kind" : [
   "lib",
   "dylib"
],

[alexcrichton]

@bors: r+

Thanks!

[bors]

📌 Commit 582bc55 has been approved by alexcrichton

[bors]

⌛ Testing commit 582bc55 with merge 6f1b860...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 6f1b860 to master...

[ehuss]

I'm curious, will this get merged to the beta channel/rustc-1.16? I'm not familiar with how rust/cargo releases and branches are handled.

[alexcrichton]

@ehuss oh is this bug on beta? I thought it was only on nightly?

[ehuss]

The original commit that added support for examples as libraries (#3556) was added to master around Jan 20. I think the rust-1.16.0 branch was made around Feb 1. This fix was committed to master on Feb 11, after the rust-1.16.0 branch was made. I assume beta is being pulled from the rust-1.16.0 branch.

[alexcrichton]

@ehuss ah yes I'll backport, thanks for the ping!

[alexcrichton]

@ehuss backported in #3826

[KalitaAlexey]

@alexcrichton,
Will 1.16 be published without the bug?

[alexcrichton]

Yes

[brson]

This is not actually in the 1.16 release as the backport occured after the build.