Skip to content

Commit ab1282c

Browse files
committed
feat: remove SnmError && color backtrace
1 parent 3fb99d1 commit ab1282c

36 files changed

+1382
-862
lines changed

.github/workflows/coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Collect coverage data
3939
# Generate separate reports for nextest and doctests, and combine them.
4040
run: |
41-
cargo llvm-cov --no-report nextest
41+
cargo llvm-cov --no-report nextest --test-threads=1
4242
cargo llvm-cov --no-report --doc
4343
cargo llvm-cov report --doctests --lcov --output-path lcov.info
4444
- name: Upload coverage data to codecov

Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ resolver = "2"
1010

1111
[profile.release]
1212
lto = true
13-
strip = "symbols"
13+
strip = "none"
1414
opt-level = "s"
15-
codegen-units = 1
15+
codegen-units = 1
16+
debug = 2

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,9 @@ use [cargo-nextest](https://nexte.st/book/pre-built-binaries) to run tests
174174

175175
for Mac:
176176

177-
```
177+
```bash
178178
curl -LsSf https://get.nexte.st/latest/mac | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
179179

180-
cargo nextest run
180+
# Without --test-threads=1, test will fail
181+
cargo nextest run --test-threads=1
181182
```

crates/cli/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ regex = "1.10.4"
5151
glob = "0.3.1"
5252
clap_complete = "4.5.1"
5353
clap_complete_fig = "4.5.0"
54+

crates/cli/src/bump.rs

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
use std::{env::current_dir, fs};
1+
use std::fs;
22

33
use colored::*;
44
use dialoguer::{theme::ColorfulTheme, Select};
55
use regex::Regex;
66
use semver::{Prerelease, Version};
7-
use snm_core::model::{PackageJson, SnmError};
7+
use snm_core::{model::PackageJson, utils::get_current_dir::get_current_dir};
88

9-
pub fn bump_impl() -> Result<(), SnmError> {
10-
let package_json = PackageJson::from_here()?;
9+
pub fn bump_impl() -> () {
10+
let package_json = PackageJson::from_here();
1111
let current_version =
1212
Version::parse(package_json.version.unwrap_or("0.0.0".to_string()).as_str())
1313
.expect("parse version error");
@@ -20,18 +20,18 @@ pub fn bump_impl() -> Result<(), SnmError> {
2020
let zero_pre_release = Prerelease::new("0").expect("create prerelease error 0");
2121

2222
let versions_and_strings = vec![
23-
create_version_and_string("major", major + 1, 0, 0, None)?,
24-
create_version_and_string("minor", major, minor + 1, 0, None)?,
25-
create_version_and_string("patch", major, minor, patch + 1, None)?,
26-
create_version_and_string("premajor", major + 1, 0, 0, Some(zero_pre_release.clone()))?,
23+
create_version_and_string("major", major + 1, 0, 0, None),
24+
create_version_and_string("minor", major, minor + 1, 0, None),
25+
create_version_and_string("patch", major, minor, patch + 1, None),
26+
create_version_and_string("premajor", major + 1, 0, 0, Some(zero_pre_release.clone())),
2727
create_version_and_string(
2828
"preminor",
2929
major,
3030
minor + 1,
3131
0,
3232
Some(zero_pre_release.clone()),
33-
)?,
34-
create_version_and_string("prepatch", major, minor, patch + 1, Some(zero_pre_release))?,
33+
),
34+
create_version_and_string("prepatch", major, minor, patch + 1, Some(zero_pre_release)),
3535
create_version_and_string(
3636
"prerelease",
3737
major,
@@ -41,7 +41,7 @@ pub fn bump_impl() -> Result<(), SnmError> {
4141
Prerelease::new(prerelease_number.to_string().as_str())
4242
.expect(format!("create prerelease error {}", prerelease_number).as_str()),
4343
),
44-
)?,
44+
),
4545
];
4646

4747
let selections: Vec<String> = versions_and_strings
@@ -58,7 +58,7 @@ pub fn bump_impl() -> Result<(), SnmError> {
5858
.interact()
5959
.expect("bump_impl Select error");
6060

61-
let dir = current_dir().expect("get current dir failed");
61+
let dir = get_current_dir();
6262

6363
let c = fs::read_to_string(dir.join("package.json")).expect(
6464
format!(
@@ -88,8 +88,6 @@ pub fn bump_impl() -> Result<(), SnmError> {
8888
"您选择了: {} , {:?}",
8989
selections[selection], versions_and_strings[selection].0
9090
);
91-
92-
Ok(())
9391
}
9492

9593
fn create_version_and_string(
@@ -98,7 +96,7 @@ fn create_version_and_string(
9896
minor: u64,
9997
patch: u64,
10098
pre: Option<Prerelease>,
101-
) -> Result<(Version, String), SnmError> {
99+
) -> (Version, String) {
102100
let mut new_version = Version::new(major, minor, patch);
103101
if let Some(p) = pre {
104102
new_version.pre = p.clone();
@@ -108,5 +106,5 @@ fn create_version_and_string(
108106
version_type,
109107
new_version.to_string().bright_black()
110108
);
111-
Ok((new_version, version_string))
109+
(new_version, version_string)
112110
}

0 commit comments

Comments
 (0)