diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-07 08:13:27 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-07 08:13:27 +0000 |
commit | 708ec9821f9bcfeafbc82f8260c264fb32b8b750 (patch) | |
tree | 09fa1352707b189a9d31fb1c7914908301c35df5 /xtask/src | |
parent | f0b7c02f16f717744e7edc79a405db14110393cf (diff) | |
parent | 0296cd590e4c0a21f75b7ec7b420d849c7e9588e (diff) |
Merge #7895
7895: :arrow_up: xflags r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src')
-rw-r--r-- | xtask/src/flags.rs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/xtask/src/flags.rs b/xtask/src/flags.rs index 56eda5b1e..b39d937ca 100644 --- a/xtask/src/flags.rs +++ b/xtask/src/flags.rs | |||
@@ -2,7 +2,9 @@ | |||
2 | 2 | ||
3 | use crate::install::{ClientOpt, Malloc, ServerOpt}; | 3 | use crate::install::{ClientOpt, Malloc, ServerOpt}; |
4 | 4 | ||
5 | xflags::args_parser! { | 5 | xflags::xflags! { |
6 | src "./src/flags.rs" | ||
7 | |||
6 | /// Run custom build command. | 8 | /// Run custom build command. |
7 | cmd xtask { | 9 | cmd xtask { |
8 | default cmd help { | 10 | default cmd help { |
@@ -55,7 +57,7 @@ xflags::args_parser! { | |||
55 | 57 | ||
56 | // generated start | 58 | // generated start |
57 | // The following code is generated by `xflags` macro. | 59 | // The following code is generated by `xflags` macro. |
58 | // Run `env XFLAGS_DUMP= cargo build` to regenerate. | 60 | // Run `env UPDATE_XFLAGS=1 cargo build` to regenerate. |
59 | #[derive(Debug)] | 61 | #[derive(Debug)] |
60 | pub struct Xtask { | 62 | pub struct Xtask { |
61 | pub subcommand: XtaskCmd, | 63 | pub subcommand: XtaskCmd, |
@@ -96,13 +98,13 @@ pub struct Codegen { | |||
96 | } | 98 | } |
97 | 99 | ||
98 | #[derive(Debug)] | 100 | #[derive(Debug)] |
99 | pub struct Lint {} | 101 | pub struct Lint; |
100 | 102 | ||
101 | #[derive(Debug)] | 103 | #[derive(Debug)] |
102 | pub struct FuzzTests {} | 104 | pub struct FuzzTests; |
103 | 105 | ||
104 | #[derive(Debug)] | 106 | #[derive(Debug)] |
105 | pub struct PreCache {} | 107 | pub struct PreCache; |
106 | 108 | ||
107 | #[derive(Debug)] | 109 | #[derive(Debug)] |
108 | pub struct Release { | 110 | pub struct Release { |
@@ -131,11 +133,10 @@ pub struct Bb { | |||
131 | } | 133 | } |
132 | 134 | ||
133 | impl Xtask { | 135 | impl Xtask { |
134 | pub const HELP: &'static str = Self::_HELP; | 136 | pub const HELP: &'static str = Self::HELP_; |
135 | 137 | ||
136 | pub fn from_env() -> xflags::Result<Self> { | 138 | pub fn from_env() -> xflags::Result<Self> { |
137 | let mut p = xflags::rt::Parser::new_from_env(); | 139 | Self::from_env_() |
138 | Self::_parse(&mut p) | ||
139 | } | 140 | } |
140 | } | 141 | } |
141 | // generated end | 142 | // generated end |