Skip to content

Commit fd8ac9f

Browse files
committed
fix(cargo): prevent crate filename collision
`cargo` has a bug that prevents correct handling of similarly named crates in the same package. Rename the internal library crate to prevent error messages. rust-lang/cargo#10368
1 parent 2db47e3 commit fd8ac9f

File tree

7 files changed

+11
-8
lines changed

7 files changed

+11
-8
lines changed

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ inherits = "release"
3636
lto = false
3737
codegen-units = 16
3838

39+
[lib]
40+
name = "ncspot_common"
41+
3942
[dependencies]
4043
chrono = "0.4"
4144
clap = "4.5.4"

src/commands.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use cursive::traits::View;
2525
use cursive::views::Dialog;
2626
use cursive::Cursive;
2727
use log::{debug, error, info};
28-
use ncspot::CONFIGURATION_FILE_NAME;
28+
use ncspot_common::CONFIGURATION_FILE_NAME;
2929
use std::cell::RefCell;
3030

3131
pub enum CommandResult {

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::{fs, process};
66

77
use cursive::theme::Theme;
88
use log::{debug, error};
9-
use ncspot::{CONFIGURATION_FILE_NAME, USER_STATE_FILE_NAME};
9+
use ncspot_common::{CONFIGURATION_FILE_NAME, USER_STATE_FILE_NAME};
1010
use platform_dirs::AppDirs;
1111

1212
use crate::command::{SortDirection, SortKey};

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::{path::PathBuf, process::exit};
88
use application::{setup_logging, Application};
99
use config::set_configuration_base_path;
1010
use log::error;
11-
use ncspot::program_arguments;
11+
use ncspot_common::program_arguments;
1212

1313
mod application;
1414
mod authentication;

src/ui/help.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use cursive::utils::markup::StyledString;
55
use cursive::view::ViewWrapper;
66
use cursive::views::{ScrollView, TextView};
77
use cursive::Cursive;
8-
use ncspot::CONFIGURATION_FILE_NAME;
8+
use ncspot_common::CONFIGURATION_FILE_NAME;
99

1010
use crate::command::{Command, MoveAmount, MoveMode};
1111
use crate::commands::CommandResult;

src/ui/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use cursive::{Cursive, CursiveRunner};
2-
use ncspot::BIN_NAME;
2+
use ncspot_common::BIN_NAME;
33

44
pub mod album;
55
pub mod artist;

xtask/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use clap::builder::PathBufValueParser;
55
use clap::error::{Error, ErrorKind};
66
use clap::ArgMatches;
77
use clap_complete::Shell;
8-
use ncspot::{AUTHOR, BIN_NAME};
8+
use ncspot_common::{AUTHOR, BIN_NAME};
99

1010
static DEFAULT_OUTPUT_DIRECTORY: &str = "misc";
1111

@@ -109,7 +109,7 @@ fn generate_manpage(subcommand_arguments: &ArgMatches) -> Result<(), DynError> {
109109
let output_directory = subcommand_arguments
110110
.get_one::<PathBuf>("output")
111111
.unwrap_or(&default_output_directory);
112-
let cmd = ncspot::program_arguments();
112+
let cmd = ncspot_common::program_arguments();
113113
let man = clap_mangen::Man::new(cmd);
114114
let mut buffer: Vec<u8> = Default::default();
115115

@@ -154,7 +154,7 @@ fn generate_shell_completion(subcommand_arguments: &ArgMatches) -> Result<(), Dy
154154
for shell in shells {
155155
clap_complete::generate_to(
156156
shell,
157-
&mut ncspot::program_arguments(),
157+
&mut ncspot_common::program_arguments(),
158158
BIN_NAME,
159159
output_directory,
160160
)?;

0 commit comments

Comments
 (0)