diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-24 15:11:51 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-07-24 15:11:51 +0100 |
commit | 3d799b66df8550a21523d42116a9b83116aa92d8 (patch) | |
tree | a3e6667b7995844e25910c82e047ba148e976d54 /xtask/src/main.rs | |
parent | f4f106dcead91dda26d6683ef584a020444dd6fe (diff) | |
parent | 93dfa39766b7470000e0de32ec2fc1b450c6e2a5 (diff) |
Merge #5523
5523: Minor r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src/main.rs')
-rw-r--r-- | xtask/src/main.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 53d3ce3e7..fab984fc0 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs | |||
@@ -13,7 +13,7 @@ use std::env; | |||
13 | use pico_args::Arguments; | 13 | use pico_args::Arguments; |
14 | use xtask::{ | 14 | use xtask::{ |
15 | codegen::{self, Mode}, | 15 | codegen::{self, Mode}, |
16 | dist::run_dist, | 16 | dist::DistCmd, |
17 | install::{ClientOpt, InstallCmd, Malloc, ServerOpt}, | 17 | install::{ClientOpt, InstallCmd, Malloc, ServerOpt}, |
18 | not_bash::pushd, | 18 | not_bash::pushd, |
19 | pre_commit, project_root, | 19 | pre_commit, project_root, |
@@ -115,7 +115,7 @@ FLAGS: | |||
115 | let nightly = args.contains("--nightly"); | 115 | let nightly = args.contains("--nightly"); |
116 | let client_version: Option<String> = args.opt_value_from_str("--client")?; | 116 | let client_version: Option<String> = args.opt_value_from_str("--client")?; |
117 | args.finish()?; | 117 | args.finish()?; |
118 | run_dist(nightly, client_version) | 118 | DistCmd { nightly, client_version }.run() |
119 | } | 119 | } |
120 | _ => { | 120 | _ => { |
121 | eprintln!( | 121 | eprintln!( |
@@ -133,7 +133,8 @@ SUBCOMMANDS: | |||
133 | codegen | 133 | codegen |
134 | install | 134 | install |
135 | lint | 135 | lint |
136 | dist" | 136 | dist |
137 | promote" | ||
137 | ); | 138 | ); |
138 | Ok(()) | 139 | Ok(()) |
139 | } | 140 | } |