Implemented string lookup for build.rustflags config key

[ibabushkin]

This addresses the immediate issue described in #3052 .
I am, however, unsure about the current state of the deeper issues mentioned in that issue, but if needed, I can take stab at them as well. :)

[rust-highfive]

r? @alexcrichton

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

[alexcrichton]

Looks good to me, thanks! Could you add a test for this as well?

[ibabushkin]

Sure, will do!

Also, it would make sense to allow for the same syntax in the target.<...> section, I think I'll add that as well.

[ibabushkin]

While building the test case, I noticed that some moving part outside of cargo is doing config file validation, killing the process with an error message before my code runs:

error: invalid configuration for key `build.rustflags`
expected a list, but found a string for `build.rustflags` in /path/here

I'll look into it now.

EDIT: It is indeed a part in cargo, but the message shouldn't be printed, given we want to retry with a different lookup.

[alexcrichton]

Oh I think it's the get_list(key)?, you'll want to change that to handle the error by looking up a string instead

[ibabushkin]

Yes, I figured as much :). Still needs a way to generate a better error message signalling the user can use both strings and lists.

It will probably be somewhat longer and less elegant, however.

[ibabushkin]

Hm, after fiddling around with the code a bit, I think this is the cleanest implementation:

    match config.values()?.get(&key) {
        Some(&ConfigValue::String(ref arg, _)) => {
            return Ok(arg.split(' ').map(str::to_string).collect());
        },
        Some(&ConfigValue::List(ref args, _)) => {
            let args = args.into_iter().map(|a| a.0.clone());
            return Ok(args.collect());
        },
        Some(value) => return config.expected("list or string", &key, value.clone()),
        None => (),
    }

[alexcrichton]

Ah I prefer to use get_string and get_list wherever possible as it works with the env vars (where the values() method doesn't right now

[ibabushkin]

Yes, that's indeed a pitfall. I guess it won't work without a third lookup for the value, however, if we want a custom error message (which I think would make sense). Or I could implement something like get_string_or_list with all the functionality as in get_string and get_list and use that, but I'm not sure whether that's worth it, given that there would be only these two calls to it. It might prove handy in the future, however.

[alexcrichton]

Oh runtime we don't really have to worry about here, just errors and such.

[alexcrichton]

Looks good to me, thanks! Want to go ahead and refactor this to perhaps get_list_or_maybe_string or something like that?

[ibabushkin]

Sure. I also still need to figure out the details around the second test failing.

[ibabushkin]

This should, when passing all tests, be a complete solution in my book ^^.

[alexcrichton]

@bors: r+

Thanks!

[bors]

📌 Commit f440704 has been approved by alexcrichton

[bors]

⌛ Testing commit f440704 with merge 4aef11e...

[bors]

💔 Test failed - status-appveyor

[alexcrichton]

@bors: retry

…

On Fri, Dec 2, 2016 at 2:07 PM, bors ***@***.***> wrote: 💔 Test failed - status-appveyor <https://ci.appveyor.com/project/rust-lang-libs/cargo/build/1.0.509> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3356 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95IDo21IuCPnf3Q83gxHmbunPLe9Pks5rEJaNgaJpZM4LBxHg> .

[bors]

⌛ Testing commit f440704 with merge c2852b1...

[bors]

💔 Test failed - status-travis

[alexcrichton]

@bors: retry

[bors]

⌛ Testing commit f440704 with merge f33b7b0...

[bors]

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

[ibabushkin]

Thanks for having me!