itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix check_for_file_and_add's check for conflict file

Browse Source 
Signed-off-by: Eval EXEC <execvy@gmail.com>
This commit is contained in:
Eval EXEC 2023-05-13 12:17:45 +08:00
parent f7d0c8bf94
commit 1dde1e16ee
No known key found for this signature in database
GPG Key ID: 0F0272C0D3AC91F7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cargo/ops/cargo_package.rs
View File

@ -332,10 +332,7 @@ fn check_for_file_and_add(
Err(_) => { Err(_) => {
// The file exists somewhere outside of the package. // The file exists somewhere outside of the package.
let file_name = file_path.file_name().unwrap(); let file_name = file_path.file_name().unwrap();
if result if result.iter().any(|ar| ar.rel_path == file_name) {
.iter()
.any(|ar| ar.rel_path.file_name().unwrap() == file_name)
{
ws.config().shell().warn(&format!( ws.config().shell().warn(&format!(
"{} `{}` appears to be a path outside of the package, \ "{} `{}` appears to be a path outside of the package, \
but there is already a file named `{}` in the root of the package. \ but there is already a file named `{}` in the root of the package. \