diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-01 17:51:35 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-01 17:51:35 +0000 |
commit | 5efb7f85eb24c7ad76136a7d81e8f8cffe213aa8 (patch) | |
tree | 0795d7277733920361a260db1a65306f1a47e1ac /xtask/src/release.rs | |
parent | c17f2bf2a27798858ef2e3012ca28295aed46efa (diff) | |
parent | d9dcfd81c5d4325379ac88c4250b9c77ecbd75e8 (diff) |
Merge #7830
7830: Simplify xtask r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'xtask/src/release.rs')
-rw-r--r-- | xtask/src/release.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xtask/src/release.rs b/xtask/src/release.rs index 63556476d..5008881e4 100644 --- a/xtask/src/release.rs +++ b/xtask/src/release.rs | |||
@@ -4,12 +4,12 @@ use xshell::{cmd, cp, pushd, read_dir, write_file}; | |||
4 | 4 | ||
5 | use crate::{codegen, date_iso, is_release_tag, project_root, Mode, Result}; | 5 | use crate::{codegen, date_iso, is_release_tag, project_root, Mode, Result}; |
6 | 6 | ||
7 | pub struct ReleaseCmd { | 7 | pub(crate) struct ReleaseCmd { |
8 | pub dry_run: bool, | 8 | pub(crate) dry_run: bool, |
9 | } | 9 | } |
10 | 10 | ||
11 | impl ReleaseCmd { | 11 | impl ReleaseCmd { |
12 | pub fn run(self) -> Result<()> { | 12 | pub(crate) fn run(self) -> Result<()> { |
13 | if !self.dry_run { | 13 | if !self.dry_run { |
14 | cmd!("git switch release").run()?; | 14 | cmd!("git switch release").run()?; |
15 | cmd!("git fetch upstream --tags --force").run()?; | 15 | cmd!("git fetch upstream --tags --force").run()?; |
@@ -86,12 +86,12 @@ https://github.com/sponsors/rust-analyzer[GitHub Sponsors]. | |||
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | pub struct PromoteCmd { | 89 | pub(crate) struct PromoteCmd { |
90 | pub dry_run: bool, | 90 | pub(crate) dry_run: bool, |
91 | } | 91 | } |
92 | 92 | ||
93 | impl PromoteCmd { | 93 | impl PromoteCmd { |
94 | pub fn run(self) -> Result<()> { | 94 | pub(crate) fn run(self) -> Result<()> { |
95 | let _dir = pushd("../rust-rust-analyzer")?; | 95 | let _dir = pushd("../rust-rust-analyzer")?; |
96 | cmd!("git switch master").run()?; | 96 | cmd!("git switch master").run()?; |
97 | cmd!("git fetch upstream").run()?; | 97 | cmd!("git fetch upstream").run()?; |