Skip to content

Commit ee6b9d9

Browse files
sjoerdsimonssjoerdsimons
committed
chore: clippy --fix for uninlined_format_args
1 parent 0275a0f commit ee6b9d9

File tree

6 files changed

+29
-35
lines changed

6 files changed

+29
-35
lines changed

‎open-build-service-api/examples/obsapi.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ async fn log(client: Client, opts: PackageFull) -> Result<()> {
5050
let log = p.log(&opts.repository, &opts.arch);
5151

5252
let (size, mtime) = log.entry().await?;
53-
println!("Log: size: {}, mtime: {}", size, mtime);
53+
println!("Log: size: {size}, mtime: {mtime}");
5454

5555
let mut stdout = tokio::io::stdout();
5656

‎open-build-service-api/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ impl<'a> PackageLogStream<'a> {
577577
let mut url = self.url.clone();
578578
url.query_pairs_mut()
579579
.append_pair("nostream", "1")
580-
.append_pair("start", &format!("{}", offset));
580+
.append_pair("start", &format!("{offset}"));
581581
if let Some(end) = self.options.end {
582582
url.query_pairs_mut().append_pair("end", &end.to_string());
583583
}

‎open-build-service-api/tests/integration.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ async fn test_commits() {
440440
assert_eq!(missing.entries[0].name, test_entry.name);
441441
assert_eq!(missing.entries[0].md5, test_entry.md5);
442442
} else {
443-
panic!("Expected missing entries, got {:?}", commit_result);
443+
panic!("Expected missing entries, got {commit_result:?}");
444444
}
445445

446446
package_1
@@ -462,7 +462,7 @@ async fn test_commits() {
462462
assert_eq!(directory.entries[0].name, test_entry.name);
463463
assert_eq!(directory.entries[0].md5, test_entry.md5);
464464
} else {
465-
panic!("Expected missing entries, got {:?}", commit_result);
465+
panic!("Expected missing entries, got {commit_result:?}");
466466
}
467467

468468
let directory = package_1.list(None).await.unwrap();
@@ -482,8 +482,8 @@ async fn test_branch() {
482482
let test_file = "test";
483483
let test_contents = b"some file contents here";
484484

485-
let test_project_branched_1 = format!("home:{}:branches:{}", DEFAULT_USERNAME, TEST_PROJECT);
486-
let test_project_branched_2 = format!("{}:branch", TEST_PROJECT);
485+
let test_project_branched_1 = format!("home:{DEFAULT_USERNAME}:branches:{TEST_PROJECT}");
486+
let test_project_branched_2 = format!("{TEST_PROJECT}:branch");
487487

488488
let mock = start_mock().await;
489489
mock.add_project(TEST_PROJECT.to_owned());

‎open-build-service-mock/src/api/build.rs‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,23 @@ fn unknown_repo(project: &str, repo: &str) -> ApiError {
1313
ApiError::new(
1414
StatusCode::NOT_FOUND,
1515
"404".to_owned(),
16-
format!("project '{}' has no repository '{}'", project, repo),
16+
format!("project '{project}' has no repository '{repo}'"),
1717
)
1818
}
1919

2020
fn unknown_arch(project: &str, repo: &str, arch: &str) -> ApiError {
2121
ApiError::new(
2222
StatusCode::NOT_FOUND,
2323
"404".to_owned(),
24-
format!(
25-
"repository '{}/{}' has no architecture '{}'",
26-
project, repo, arch
27-
),
24+
format!("repository '{project}/{repo}' has no architecture '{arch}'"),
2825
)
2926
}
3027

3128
fn unknown_parameter(param: &str) -> ApiError {
3229
ApiError::new(
3330
StatusCode::BAD_REQUEST,
3431
"400".to_owned(),
35-
format!("unknown parameter '{}'", param),
32+
format!("unknown parameter '{param}'"),
3633
)
3734
}
3835

@@ -50,8 +47,8 @@ impl Respond for ProjectBuildCommandResponder {
5047
fn respond(&self, request: &Request) -> ResponseTemplate {
5148
try_api!(check_auth(self.mock.auth(), request));
5249

53-
let components = request.url.path_segments().unwrap();
54-
let project_name = components.last().unwrap();
50+
let mut components = request.url.path_segments().unwrap();
51+
let project_name = components.next_back().unwrap();
5552

5653
let mut projects = self.mock.projects().write().unwrap();
5754
let project = try_api!(
@@ -161,8 +158,8 @@ impl Respond for RepoListingResponder {
161158
fn respond(&self, request: &Request) -> ResponseTemplate {
162159
try_api!(check_auth(self.mock.auth(), request));
163160

164-
let components = request.url.path_segments().unwrap();
165-
let project_name = components.last().unwrap();
161+
let mut components = request.url.path_segments().unwrap();
162+
let project_name = components.next_back().unwrap();
166163

167164
let projects = self.mock.projects().read().unwrap();
168165
let project = try_api!(
@@ -593,7 +590,7 @@ impl Respond for BuildBinaryFileResponder {
593590
.ok_or_else(|| ApiError::new(
594591
StatusCode::NOT_FOUND,
595592
"404".to_owned(),
596-
format!("{}: No such file or directory", file_name)
593+
format!("{file_name}: No such file or directory")
597594
))
598595
);
599596
ResponseTemplate::new(StatusCode::OK)
@@ -689,7 +686,7 @@ fn parse_number_param(value: Cow<str>) -> Result<usize, ApiError> {
689686
ApiError::new(
690687
StatusCode::BAD_REQUEST,
691688
"400".to_owned(),
692-
format!("not a number: '{}'", value),
689+
format!("not a number: '{value}'"),
693690
)
694691
})
695692
}
@@ -740,7 +737,7 @@ impl Respond for BuildLogResponder {
740737
ApiError::new(
741738
StatusCode::BAD_REQUEST,
742739
"400".to_owned(),
743-
format!("unknown view '{}'", value)
740+
format!("unknown view '{value}'")
744741
)
745742
);
746743
entry_view = true;
@@ -781,7 +778,7 @@ impl Respond for BuildLogResponder {
781778
let package = try_api!(arch.packages.get(package_name).ok_or_else(|| ApiError::new(
782779
StatusCode::BAD_REQUEST,
783780
"400".to_owned(),
784-
format!("remote error: {} no logfile", package_name)
781+
format!("remote error: {package_name} no logfile")
785782
)));
786783

787784
let log = if last_successful {
@@ -818,7 +815,7 @@ impl Respond for BuildLogResponder {
818815
ApiError::new(
819816
StatusCode::BAD_REQUEST,
820817
"400".to_owned(),
821-
format!("remote error: start out of range {}", start)
818+
format!("remote error: start out of range {start}")
822819
)
823820
);
824821

‎open-build-service-mock/src/api/source.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn source_file_not_found(name: &str) -> ApiError {
2020
ApiError::new(
2121
StatusCode::NOT_FOUND,
2222
"404".to_owned(),
23-
format!("{}: no such file", name),
23+
format!("{name}: no such file"),
2424
)
2525
}
2626

@@ -361,7 +361,7 @@ impl Respond for PackageSourceListingResponder {
361361
let index: usize = try_api!(rev_arg.parse().map_err(|_| ApiError::new(
362362
StatusCode::BAD_REQUEST,
363363
"400".to_owned(),
364-
format!("bad revision '{}'", rev_arg)
364+
format!("bad revision '{rev_arg}'")
365365
)));
366366
ensure!(
367367
index <= package.revisions.len() && (index > 0 || !list_meta),
@@ -737,8 +737,7 @@ fn do_branch(
737737
StatusCode::BAD_REQUEST,
738738
"not_missing".to_owned(),
739739
format!(
740-
"Branch call with missingok parameter but branched source ({}/{}) exists.",
741-
origin_project_name, origin_package_name
740+
"Branch call with missingok parameter but branched source ({origin_project_name}/{origin_package_name}) exists."
742741
),
743742
)
744743
.into_response();
@@ -784,8 +783,7 @@ fn do_branch(
784783
StatusCode::BAD_REQUEST,
785784
"double_branch_package".to_owned(),
786785
format!(
787-
"branch target package already exists: {}/{}",
788-
target_project_name, target_package_name
786+
"branch target package already exists: {target_project_name}/{target_package_name}"
789787
)
790788
)
791789
);

‎open-build-service-mock/src/lib.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -559,14 +559,13 @@ type ProjectMap = HashMap<String, MockProject>;
559559
fn get_project<'p>(projects: &'p mut ProjectMap, name: &str) -> &'p mut MockProject {
560560
projects
561561
.get_mut(name)
562-
.unwrap_or_else(|| panic!("Unknown project: {}", name))
562+
.unwrap_or_else(|| panic!("Unknown project: {name}"))
563563
}
564564

565565
fn ensure_source_package_exists(project: &mut MockProject, package_name: &str) {
566566
assert!(
567567
project.packages.contains_key(package_name),
568-
"Unknown package: {}",
569-
package_name
568+
"Unknown package: {package_name}"
570569
);
571570
}
572571

@@ -578,16 +577,16 @@ fn get_repo<'p, 'n>(
578577
project
579578
.repos
580579
.get_mut(repo_name)
581-
.unwrap_or_else(|| panic!("Unknown repo: {}", repo_name))
580+
.unwrap_or_else(|| panic!("Unknown repo: {repo_name}"))
582581
.get_mut(arch)
583-
.unwrap_or_else(|| panic!("Unknown arch: {}/{}", repo_name, arch))
582+
.unwrap_or_else(|| panic!("Unknown arch: {repo_name}/{arch}"))
584583
}
585584

586585
fn get_package<'p>(project: &'p mut MockProject, name: &str) -> &'p mut MockPackage {
587586
project
588587
.packages
589588
.get_mut(name)
590-
.unwrap_or_else(|| panic!("Unknown package: {}", name))
589+
.unwrap_or_else(|| panic!("Unknown package: {name}"))
591590
}
592591

593592
struct Inner {
@@ -786,7 +785,7 @@ impl ObsMock {
786785
let mut projects = self.inner.projects.write().unwrap();
787786
let project = projects
788787
.get_mut(project_name)
789-
.unwrap_or_else(|| panic!("Unknown project: {}", project_name));
788+
.unwrap_or_else(|| panic!("Unknown project: {project_name}"));
790789
let package = get_package(project, package_name);
791790

792791
let meta = MockSourceFile::new_metadata(project_name, package_name, &options.disabled);
@@ -818,7 +817,7 @@ impl ObsMock {
818817
let mut projects = self.inner.projects.write().unwrap();
819818
let project = projects
820819
.get_mut(project_name)
821-
.unwrap_or_else(|| panic!("Unknown project: {}", project_name));
820+
.unwrap_or_else(|| panic!("Unknown project: {project_name}"));
822821
let package = get_package(project, package_name);
823822

824823
let (key, contents) = file.into_key_and_contents();

0 commit comments

Comments
 (0)