Merge #123

123: Prepare v0.3.6 & bump deps r=burrbull a=Emilgardis

Bump deps and prepare for release

Fixes #122 

Co-authored-by: Emil Gardström <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.3.6] - 2022-06-19
+
 ### Added
 
 - Action to build binaries and release for every version tag and latest commit
 
+### Changed
+
+- Bump `cargo_metadata` to 0.14 and `rustc_version` to 0.4
+
 ## [v0.3.5] - 2022-02-12
 
 ### Added
@@ -183,7 +189,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Initial release
 
-[Unreleased]: https://github.com/rust-embedded/cargo-binutils/compare/v0.3.5...HEAD
+[Unreleased]: https://github.com/rust-embedded/cargo-binutils/compare/v0.3.6...HEAD
+[v0.3.6]: https://github.com/rust-embedded/cargo-binutils/compare/v0.3.5...v0.3.6
 [v0.3.5]: https://github.com/rust-embedded/cargo-binutils/compare/v0.3.4...v0.3.5
 [v0.3.4]: https://github.com/rust-embedded/cargo-binutils/compare/v0.3.3...v0.3.4
 [v0.3.3]: https://github.com/rust-embedded/cargo-binutils/compare/v0.3.2...v0.3.3

Cargo.toml

@@ -15,12 +15,12 @@ repository = "https://github.com/rust-embedded/cargo-binutils/"
 version = "0.3.5"
 
 [dependencies]
-cargo_metadata = "0.11"
+cargo_metadata = "0.14"
 clap = "2.33"
 regex = "1.5.5"
 rustc-cfg = "0.4"
 rustc-demangle = "0.1"
-rustc_version = "0.2"
+rustc_version = "0.4"
 serde = "1.0"
 toml = "0.5"
 anyhow = "1.0"

src/lib.rs

@@ -1,11 +1,12 @@
 #![deny(warnings)]
 
 use std::io::{self, BufReader, Write};
-use std::path::{Component, Path};
+use std::path::Path;
 use std::process::{Command, Stdio};
 use std::{env, str};
 
 use anyhow::{bail, Result};
+use cargo_metadata::camino::Utf8Component;
 use cargo_metadata::{Artifact, CargoOpt, Message, Metadata, MetadataCommand};
 use clap::{App, AppSettings, Arg, ArgMatches};
 use rustc_cfg::Cfg;
@@ -56,8 +57,8 @@ impl Context {
 
         // Should always succeed.
         let target_path = artifact.filenames[0].strip_prefix(metadata.target_directory)?;
-        let target_name = if let Some(Component::Normal(path)) = target_path.components().next() {
-            let path = path.to_string_lossy();
+        let target_name = if let Some(Utf8Component::Normal(path)) = target_path.components().next()
+        {
             // TODO: How will custom profiles impact this?
             if path == "debug" || path == "release" {
                 // Looks like this artifact was built for the host.
@@ -82,7 +83,7 @@ impl Context {
         let mut config_target_name = None;
         let config: toml::Value;
 
-        if let Some(path) = search(&metadata.workspace_root, ".cargo/config") {
+        if let Some(path) = search(metadata.workspace_root.as_std_path(), ".cargo/config") {
             config = parse(&path.join(".cargo/config"))?;
             config_target_name = config
                 .get("build")