From: bors <bors@rust-lang.org>
Date: Sun, 25 Feb 2018 12:22:31 +0000 (+0000)
Subject: Auto merge of #5074 - CAD97:patch-1, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~83
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ed8dfce4c119dca307c428e879a075bd24ab51b8;p=cargo.git

Auto merge of #5074 - CAD97:patch-1, r=alexcrichton

Separate licenses with a `/` instead of ` OR `

It's what we tell others to do.

https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata

> ```toml
> # This is a string description of the license for this package. Currently
> # crates.io will validate the license provided against a whitelist of known
> # license identifiers from http://spdx.org/licenses/. Multiple licenses can be
> # separated with a `/`.
> license = "..."
> ```

Noted [here](https://github.com/TeXitoi/structopt/pull/71#discussion_r170423582).

This should either use `/` or a note should be added that ` OR ` is allowed as a combination operator.
---

ed8dfce4c119dca307c428e879a075bd24ab51b8