waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: warning on compiler version mismatch

This commit is contained in:
rvcas 2024-06-13 20:26:39 -04:00
parent 0ebffa2b9e
commit de870e2529
No known key found for this signature in database
GPG Key ID: C09B64E263F7D68C
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/aiken-project/src/error.rs
View File

@ -510,6 +510,8 @@ pub enum Warning {
DependencyAlreadyExists { name: PackageName }, DependencyAlreadyExists { name: PackageName },
#[error("Ignoring file with invalid module name at: {path:?}")] #[error("Ignoring file with invalid module name at: {path:?}")]
InvalidModuleName { path: PathBuf }, InvalidModuleName { path: PathBuf },
#[error("aiken.toml demands compiler version {demanded}, but you are using {current}.")]
CompilerVersionMismatch { demanded: String, current: String },
} }
impl ExtraData for Warning { impl ExtraData for Warning {
@ -517,7 +519,8 @@ impl ExtraData for Warning {
match self { match self {
Warning::NoValidators { .. } Warning::NoValidators { .. }
| Warning::DependencyAlreadyExists { .. } | Warning::DependencyAlreadyExists { .. }
| Warning::InvalidModuleName { .. } => None, | Warning::InvalidModuleName { .. }
| Warning::CompilerVersionMismatch { .. } => None,
Warning::Type { warning, .. } => warning.extra_data(), Warning::Type { warning, .. } => warning.extra_data(),
} }
} }
@ -527,7 +530,9 @@ impl GetSource for Warning {
fn path(&self) -> Option<PathBuf> { fn path(&self) -> Option<PathBuf> {
match self { match self {
Warning::InvalidModuleName { path } | Warning::Type { path, .. } => Some(path.clone()), Warning::InvalidModuleName { path } | Warning::Type { path, .. } => Some(path.clone()),
Warning::NoValidators | Warning::DependencyAlreadyExists { .. } => None, Warning::NoValidators
| Warning::DependencyAlreadyExists { .. }
| Warning::CompilerVersionMismatch { .. } => None,
} }
} }
@ -536,7 +541,8 @@ impl GetSource for Warning {
Warning::Type { src, .. } => Some(src.clone()), Warning::Type { src, .. } => Some(src.clone()),
Warning::NoValidators Warning::NoValidators
| Warning::InvalidModuleName { .. } | Warning::InvalidModuleName { .. }
| Warning::DependencyAlreadyExists { .. } => None, | Warning::DependencyAlreadyExists { .. }
| Warning::CompilerVersionMismatch { .. } => None,
} }
} }
} }
@ -551,7 +557,8 @@ impl Diagnostic for Warning {
Warning::Type { named, .. } => Some(named), Warning::Type { named, .. } => Some(named),
Warning::NoValidators Warning::NoValidators
| Warning::InvalidModuleName { .. } | Warning::InvalidModuleName { .. }
| Warning::DependencyAlreadyExists { .. } => None, | Warning::DependencyAlreadyExists { .. }
| Warning::CompilerVersionMismatch { .. } => None,
} }
} }
@ -560,7 +567,8 @@ impl Diagnostic for Warning {
Warning::Type { warning, .. } => warning.labels(), Warning::Type { warning, .. } => warning.labels(),
Warning::InvalidModuleName { .. } Warning::InvalidModuleName { .. }
| Warning::NoValidators | Warning::NoValidators
| Warning::DependencyAlreadyExists { .. } => None, | Warning::DependencyAlreadyExists { .. }
| Warning::CompilerVersionMismatch { .. } => None,
} }
} }
@ -572,6 +580,9 @@ impl Diagnostic for Warning {
))), ))),
Warning::NoValidators => Some(Box::new("aiken::check")), Warning::NoValidators => Some(Box::new("aiken::check")),
Warning::InvalidModuleName { .. } => Some(Box::new("aiken::project::module_name")), Warning::InvalidModuleName { .. } => Some(Box::new("aiken::project::module_name")),
Warning::CompilerVersionMismatch { .. } => {
Some(Box::new("aiken::project::compiler_version_mismatch"))
}
Warning::DependencyAlreadyExists { .. } => { Warning::DependencyAlreadyExists { .. } => {
Some(Box::new("aiken::packages::already_exists")) Some(Box::new("aiken::packages::already_exists"))
} }
@ -582,6 +593,10 @@ impl Diagnostic for Warning {
match self { match self {
Warning::Type { warning, .. } => warning.help(), Warning::Type { warning, .. } => warning.help(),
Warning::NoValidators => None, Warning::NoValidators => None,
Warning::CompilerVersionMismatch { demanded, .. } => Some(Box::new(format!(
"You may want to switch to {}",
demanded.if_supports_color(Stdout, |s| s.purple())
))),
Warning::InvalidModuleName { .. } => Some(Box::new( Warning::InvalidModuleName { .. } => Some(Box::new(
"Module names are lowercase, (ascii) alpha-numeric and may contain dashes or underscores.", "Module names are lowercase, (ascii) alpha-numeric and may contain dashes or underscores.",
)), )),

13
crates/aiken-project/src/lib.rs
View File

@ -106,7 +106,18 @@ where
pub fn new(root: PathBuf, event_listener: T) -> Result<Project<T>, Error> { pub fn new(root: PathBuf, event_listener: T) -> Result<Project<T>, Error> {
let config = Config::load(&root)?; let config = Config::load(&root)?;
let project = Project::new_with_config(config, root, event_listener); let demanded_compiler_version = format!("v{}", config.compiler);
let mut project = Project::new_with_config(config, root, event_listener);
let current_compiler_version = config::compiler_version(false);
if demanded_compiler_version != current_compiler_version {
project.warnings.push(Warning::CompilerVersionMismatch {
demanded: demanded_compiler_version,
current: current_compiler_version,
})
}
Ok(project) Ok(project)
} }