Skip to content

Commit

Permalink
Merge #742
Browse files Browse the repository at this point in the history
742: Bump structopt from 0.2.18 to 0.3.0 r=MarkMcCaskey a=dependabot-preview[bot]

Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.2.18 to 0.3.0.
<details>
<summary>Changelog</summary>

*Sourced from [structopt's changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md).*

> # v0.3.0 (2019-08-30)
> 
> ## Breaking changes
> 
> ### Bump minimum rustc version to 1.36 by [@&#8203;TeXitoi](https://github.com/TeXitoi)
> Now `rustc` 1.36 is the minimum compiler version supported by `structopt`,
> it likely won't work with older compilers.
> 
> ### Remove "nightly" feature
> Once upon a time this feature had been used to enable some of improvements
> in `proc-macro2` crate that were available only on nightly. Nowadays this feature doesn't
> mean anything so it's now removed.
> 
> ### Support optional vectors of arguments for distinguishing between `-o 1 2`, `-o` and no option provided at all by [@&#8203;sphynx](https://github.com/sphynx) ([#180](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/188)).
> 
> ```rust
> #[derive(StructOpt)]
> struct Opt {
>   #[structopt(long)]
>   fruit: Option<Vec<String>>,
> }
> 
> fn main() {
>   assert_eq!(Opt::from_args(&["test"]), None);
>   assert_eq!(Opt::from_args(&["test", "--fruit"]), Some(vec![]));
>   assert_eq!(Opt::from_args(&["test", "--fruit=apple orange"]), Some(vec!["apple", "orange"]));
> }
> ```
> 
> If you need to fall back to the old behavior you can use a type alias:
> ```rust
> type Something = Vec<String>;
> 
> #[derive(StructOpt)]
> struct Opt {
>   #[structopt(long)]
>   fruit: Option<Vec<String>>,
> }
> ```
> 
> ### Change default case from 'Verbatim' into 'Kebab' by [@&#8203;0ndorio](https://github.com/0ndorio) ([#202](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/202)).
> `structopt` 0.3 uses field renaming to deduce a name for long options and subcommands.
> 
> ```rust
> #[derive(StructOpt)]
> struct Opt {
>   #[structopt(long)]
>   http_addr: String, // will be renamed to `--http-addr`
> 
>   #[structopt(subcommand)]
></tr></table> ... (truncated)
</details>
<details>
<summary>Commits</summary>

- [`673dbcc`](TeXitoi/structopt@673dbcc) Bump minimum rustc version to 1.36
- [`b57dde1`](TeXitoi/structopt@b57dde1) Update dependencies ([#227](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/227))
- [`8830771`](TeXitoi/structopt@8830771) Update documentation and changelog ([#236](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/236))
- [`6bd1a69`](TeXitoi/structopt@6bd1a69) Update keyvalue example ([#234](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/234))
- [`73db781`](TeXitoi/structopt@73db781) Update raw_bool_literal.rs ([#231](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/231))
- [`2363815`](TeXitoi/structopt@2363815) Update changelog
- [`dc5ec7a`](TeXitoi/structopt@dc5ec7a) Emit error about `raw` removal
- [`a91109c`](TeXitoi/structopt@a91109c) Change behavior of `about/author/version` and ad `no_version`
- [`5dfa606`](TeXitoi/structopt@5dfa606) Now error messages highlight the error location ([#225](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/225))
- [`94946c3`](TeXitoi/structopt@94946c3) Add documentation for `env` ([#221](https://github-redirect.dependabot.com/TeXitoi/structopt/issues/221))
- Additional commits viewable in [compare view](TeXitoi/structopt@v0.2.18...v0.3.0)
</details>
<br />

[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=structopt&package-manager=cargo&previous-version=0.2.18&new-version=0.3.0)](https://dependabot.com/compatibility-score.html?dependency-name=structopt&package-manager=cargo&previous-version=0.2.18&new-version=0.3.0)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

**Note:** This repo was added to Dependabot recently, so you'll receive a maximum of 5 PRs for your first few update runs. Once an update run creates fewer than 5 PRs we'll remove that limit.

You can always request more updates by clicking `Bump now` in your [Dependabot dashboard](https://app.dependabot.com).

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)

Finally, you can contact us by mentioning @dependabot.

</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Syrus Akbary <me@syrusakbary.com>
Co-authored-by: Mark McCaskey <mark@wasmer.io>
  • Loading branch information
4 people authored Sep 6, 2019
2 parents 240ba48 + cb750e0 commit 30d80c3
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 16 deletions.
30 changes: 21 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include = [
[dependencies]
byteorder = "1.3.2"
errno = "0.2.4"
structopt = "0.2.18"
structopt = "0.3.0"
wabt = "0.9.1"
wasmer-clif-backend = { path = "lib/clif-backend" }
wasmer-singlepass-backend = { path = "lib/singlepass-backend", optional = true }
Expand Down
15 changes: 9 additions & 6 deletions src/bin/wasmer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ mod wasmer_wasi {
}

#[derive(Debug, StructOpt)]
#[structopt(name = "wasmer", about = "Wasm execution runtime.")]
#[structopt(name = "wasmer", about = "Wasm execution runtime.", author)]
/// The options for the wasmer Command Line Interface
enum CLIOptions {
/// Run a WebAssembly file. Formats accepted: wasm, wast
Expand Down Expand Up @@ -115,7 +115,7 @@ pub struct LLVMCLIOptions {

#[derive(Debug, StructOpt)]
struct Run {
// Disable the cache
/// Disable the cache
#[structopt(long = "disable-cache")]
disable_cache: bool,

Expand All @@ -127,7 +127,8 @@ struct Run {
#[structopt(
long = "backend",
default_value = "cranelift",
raw(possible_values = "Backend::variants()", case_insensitive = "true")
case_insensitive = true,
possible_values = Backend::variants(),
)]
backend: Backend,

Expand All @@ -154,7 +155,8 @@ struct Run {
/// Custom code loader
#[structopt(
long = "loader",
raw(possible_values = "LoaderName::variants()", case_insensitive = "true")
case_insensitive = true,
possible_values = LoaderName::variants(),
)]
loader: Option<LoaderName>,

Expand All @@ -168,7 +170,8 @@ struct Run {
#[structopt(
long = "optimized-backends",
multiple = true,
raw(possible_values = "Backend::variants()", case_insensitive = "true")
case_insensitive = true,
possible_values = Backend::variants(),
)]
optimized_backends: Vec<Backend>,

Expand Down Expand Up @@ -197,7 +200,7 @@ struct Run {
features: PrestandardFeatures,

/// Application arguments
#[structopt(name = "--", raw(multiple = "true"))]
#[structopt(name = "--", multiple = true)]
args: Vec<String>,
}

Expand Down

0 comments on commit 30d80c3

Please sign in to comment.