Skip to content

Commit 313a8db

Browse files
luqvenluqven
authored
style: apply cargo fmt formatting (#22)
1 parent e345025 commit 313a8db

6 files changed

Lines changed: 110 additions & 28 deletions

File tree

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Code quality and organization standards for this project.
77
1. **Rust only** - No other languages in src/
88
2. **Unit test each module** - Tests live in the same file with `#[cfg(test)]`
99
3. **Conventional commits** - Commit when a reasonable amount of work is done
10-
4. **Run tests before committing** - `cargo test`
10+
4. **Run checks before committing** - `cargo fmt && cargo clippy && cargo test`
1111
5. **Keep functions focused** - Prefer 2-4 arguments, pass primitives directly
1212
6. **Short variable names** - Prefer concise, readable names
1313

‎src/api/mod.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ mod tests {
7777

7878
let mock = server
7979
.mock("GET", "/search/issues")
80-
.match_query(mockito::Matcher::UrlEncoded("q".into(), "TEST-123 in:title".into()))
80+
.match_query(mockito::Matcher::UrlEncoded(
81+
"q".into(),
82+
"TEST-123 in:title".into(),
83+
))
8184
.with_status(200)
8285
.with_header("content-type", "application/json")
8386
.with_body(r#"{"items": []}"#)

‎src/api/search.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ pub async fn fetch_matching_pull_requests_from_repository(
7676
repository: &str,
7777
credentials: &Credentials,
7878
) -> Result<Vec<PullRequest>, Box<dyn Error>> {
79-
8079
let client = reqwest::Client::new();
8180

8281
let request = api::base_request(

‎src/graph.rs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,23 @@ mod tests {
125125
assert_eq!(flat.len(), 3);
126126

127127
// First PR should have no parent (base is main, not in stack)
128-
assert!(flat.iter().any(|(pr, parent)| pr.number() == 1 && parent.is_none()));
129-
130-
// Second PR should have first as parent
131128
assert!(flat
132129
.iter()
133-
.any(|(pr, parent)| pr.number() == 2 && parent.as_ref().map(|p| p.number()) == Some(1)));
130+
.any(|(pr, parent)| pr.number() == 1 && parent.is_none()));
131+
132+
// Second PR should have first as parent
133+
assert!(
134+
flat.iter()
135+
.any(|(pr, parent)| pr.number() == 2
136+
&& parent.as_ref().map(|p| p.number()) == Some(1))
137+
);
134138

135139
// Third PR should have second as parent
136-
assert!(flat
137-
.iter()
138-
.any(|(pr, parent)| pr.number() == 3 && parent.as_ref().map(|p| p.number()) == Some(2)));
140+
assert!(
141+
flat.iter()
142+
.any(|(pr, parent)| pr.number() == 3
143+
&& parent.as_ref().map(|p| p.number()) == Some(2))
144+
);
139145
}
140146

141147
#[test]

‎src/markdown.rs‎

Lines changed: 91 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,15 @@ mod tests {
147147

148148
#[test]
149149
fn test_build_table_single_pr() {
150-
let pr = make_pr(1, "feature-1", "main", "Add new feature", PullRequestStatus::Open, false, None);
150+
let pr = make_pr(
151+
1,
152+
"feature-1",
153+
"main",
154+
"Add new feature",
155+
PullRequestStatus::Open,
156+
false,
157+
None,
158+
);
151159
let deps: FlatDep = vec![(pr, None)];
152160

153161
let table = build_table(&deps, "JIRA-123", None, "user/repo");
@@ -156,9 +164,33 @@ mod tests {
156164

157165
#[test]
158166
fn test_build_table_linear_stack() {
159-
let pr1 = make_pr(1, "feature-1", "main", "Base feature", PullRequestStatus::Open, false, None);
160-
let pr2 = make_pr(2, "feature-2", "feature-1", "Second feature", PullRequestStatus::Open, false, None);
161-
let pr3 = make_pr(3, "feature-3", "feature-2", "Third feature", PullRequestStatus::Open, false, None);
167+
let pr1 = make_pr(
168+
1,
169+
"feature-1",
170+
"main",
171+
"Base feature",
172+
PullRequestStatus::Open,
173+
false,
174+
None,
175+
);
176+
let pr2 = make_pr(
177+
2,
178+
"feature-2",
179+
"feature-1",
180+
"Second feature",
181+
PullRequestStatus::Open,
182+
false,
183+
None,
184+
);
185+
let pr3 = make_pr(
186+
3,
187+
"feature-3",
188+
"feature-2",
189+
"Third feature",
190+
PullRequestStatus::Open,
191+
false,
192+
None,
193+
);
162194

163195
let deps: FlatDep = vec![
164196
(pr1.clone(), None),
@@ -172,7 +204,15 @@ mod tests {
172204

173205
#[test]
174206
fn test_build_table_with_draft_pr() {
175-
let pr = make_pr(1, "wip-feature", "main", "Work in progress", PullRequestStatus::Open, true, None);
207+
let pr = make_pr(
208+
1,
209+
"wip-feature",
210+
"main",
211+
"Work in progress",
212+
PullRequestStatus::Open,
213+
true,
214+
None,
215+
);
176216
let deps: FlatDep = vec![(pr, None)];
177217

178218
let table = build_table(&deps, "DRAFT-TEST", None, "user/repo");
@@ -181,7 +221,15 @@ mod tests {
181221

182222
#[test]
183223
fn test_build_table_with_closed_pr() {
184-
let pr = make_pr(1, "old-feature", "main", "Completed feature", PullRequestStatus::Closed, false, None);
224+
let pr = make_pr(
225+
1,
226+
"old-feature",
227+
"main",
228+
"Completed feature",
229+
PullRequestStatus::Closed,
230+
false,
231+
None,
232+
);
185233
let deps: FlatDep = vec![(pr, None)];
186234

187235
let table = build_table(&deps, "CLOSED-TEST", None, "user/repo");
@@ -207,13 +255,26 @@ mod tests {
207255

208256
#[test]
209257
fn test_build_table_all_closed_shows_checkmark() {
210-
let pr1 = make_pr(1, "feature-1", "main", "First", PullRequestStatus::Closed, false, None);
211-
let pr2 = make_pr(2, "feature-2", "feature-1", "Second", PullRequestStatus::Closed, false, None);
258+
let pr1 = make_pr(
259+
1,
260+
"feature-1",
261+
"main",
262+
"First",
263+
PullRequestStatus::Closed,
264+
false,
265+
None,
266+
);
267+
let pr2 = make_pr(
268+
2,
269+
"feature-2",
270+
"feature-1",
271+
"Second",
272+
PullRequestStatus::Closed,
273+
false,
274+
None,
275+
);
212276

213-
let deps: FlatDep = vec![
214-
(pr1.clone(), None),
215-
(pr2.clone(), Some(pr1.clone())),
216-
];
277+
let deps: FlatDep = vec![(pr1.clone(), None), (pr2.clone(), Some(pr1.clone()))];
217278

218279
let table = build_table(&deps, "COMPLETE-STACK", None, "user/repo");
219280
insta::assert_snapshot!(table);
@@ -230,8 +291,24 @@ mod tests {
230291
false,
231292
Some("2024-01-15T10:00:00Z".to_string()),
232293
);
233-
let pr2 = make_pr(2, "feature-2", "feature-1", "Open follow-up", PullRequestStatus::Open, false, None);
234-
let pr3 = make_pr(3, "feature-3", "feature-2", "Draft WIP", PullRequestStatus::Open, true, None);
294+
let pr2 = make_pr(
295+
2,
296+
"feature-2",
297+
"feature-1",
298+
"Open follow-up",
299+
PullRequestStatus::Open,
300+
false,
301+
None,
302+
);
303+
let pr3 = make_pr(
304+
3,
305+
"feature-3",
306+
"feature-2",
307+
"Draft WIP",
308+
PullRequestStatus::Open,
309+
true,
310+
None,
311+
);
235312

236313
let deps: FlatDep = vec![
237314
(pr1.clone(), None),

‎src/util.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ use dialoguer::Input;
33
pub fn loop_until_confirm(prompt: &str) {
44
let prompt = format!("{} Type 'yes' to continue", prompt);
55
loop {
6-
let result: String = Input::new()
7-
.with_prompt(&prompt)
8-
.interact_text()
9-
.unwrap();
6+
let result: String = Input::new().with_prompt(&prompt).interact_text().unwrap();
107
match &result[..] {
118
"yes" => return,
129
_ => continue,

0 commit comments

Comments
 (0)