raise rust-version to 1.73 like cargo-llvm-cov, fix expected test value

mike-kfed · Jun 8, 2024 · d21053d · d21053d
1 parent 20cef71
commit d21053d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,7 +7,7 @@ description = "convert LCOV info file to cobertura XML format"
 repository = "https://github.com/mike-kfed/lcov2cobertura"
 keywords = ["coverage", "gitlab", "cobertura", "lcov"]
 categories = ["command-line-utilities"]
-rust-version = "1.59"
+rust-version = "1.73"
 
 [workspace]
 

diff --git a/lcov2cobertura/Cargo.toml b/lcov2cobertura/Cargo.toml
@@ -6,7 +6,7 @@ license = "Apache-2.0"
 description = "convert LCOV info file to cobertura XML format"
 repository = "https://github.com/mike-kfed/lcov2cobertura"
 keywords = ["coverage", "gitlab", "cobertura", "lcov"]
-rust-version = "1.59"
+rust-version = "1.73"
 
 [dependencies]
 anyhow = "1.0.86"

diff --git a/lcov2cobertura/src/lib.rs b/lcov2cobertura/src/lib.rs
@@ -326,23 +326,21 @@ pub fn parse_lines<P: AsRef<Path>, B: BufRead>(
         let mut split = line.splitn(2, ':');
         let (input_type, line) = (split.next(), split.last());
 
-        // proposed improvement only works in rustc 1.63 and above
-        #[allow(clippy::assigning_clones)]
         match input_type {
             Some("SF") => {
                 let file_name = line.ok_or_else(|| anyhow::anyhow!("SF entry has no filename"))?;
                 let file_path = Path::new(file_name);
                 // TODO: was `relative_file_name = os.path.relpath(file_name, self.base_dir)`
                 // does not do the same as strip_prefix, but I am fairly certain it was the idea
                 // TODO: proper unwrap error handling
-                relative_file_name = file_path
+                file_path
                     .strip_prefix(base_dir)
                     .unwrap_or(file_path)
                     .to_str()
                     .ok_or_else(|| {
                         anyhow::anyhow!("relative_file_name cannot be converted to string")
                     })?
-                    .to_owned();
+                    .clone_into(&mut relative_file_name);
                 let elems = relative_file_name
                     .split(std::path::MAIN_SEPARATOR)
                     .collect::<Vec<&str>>();

diff --git a/lcov2cobertura/src/tests.rs b/lcov2cobertura/src/tests.rs
@@ -202,7 +202,7 @@ fn test_demangle_rust() {
             <classes>
                 <class branch-rate="0" complexity="0" filename="foo/foo.cpp" line-rate="1" name="foo.foo.cpp">
                     <methods>
-                        <method name="foo[0]" signature="" complexity="0" line-rate="1" branch-rate="1">
+                        <method name="foo" signature="" complexity="0" line-rate="1" branch-rate="1">
                             <lines>
                                 <line hits="1" number="8" branch="false"/>
                             </lines>
@@ -212,7 +212,7 @@ fn test_demangle_rust() {
                                 <line hits="1" number="0" branch="false"/>
                             </lines>
                         </method>
-                        <method name="123foo[0]::bar" signature="" complexity="0" line-rate="0" branch-rate="0">
+                        <method name="123foo::bar" signature="" complexity="0" line-rate="0" branch-rate="0">
                             <lines>
                                 <line hits="0" number="3" branch="false"/>
                             </lines>