language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-07 22:55:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

clippy on everything

Browse source
This commit is contained in:
faldor20 2024-12-12 02:37:01 +10:00
parent 7eb81fbcf3
commit a7308130cf
No known key found for this signature in database
GPG key ID: F2216079B890CD57
14 changed files with 97 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ci/repl_basic_test/src/main.rs
View file

@ -17,13 +17,14 @@ fn roc_repl_session() -> Result<PtyReplSession, Error> {
fn main() -> Result<(), Error> {
let mut repl = roc_repl_session()?;
repl.exp_regex(".*roc repl.*")?;
repl.send_line("1+1")?;
thread::sleep(Duration::from_secs(1));
match repl.exp_regex(r".*2\u{1b}\[1;32m : \u{1b}\[0mNum *.*") { // 2 : Num
match repl.exp_regex(r".*2\u{1b}\[1;32m : \u{1b}\[0mNum *.*") {
// 2 : Num
Ok(_) => {
println!("Expected output received.");
return Ok(());
@ -33,4 +34,4 @@ fn main() -> Result<(), Error> {
std::process::exit(1);
}
}
}
}

2
crates/compiler/build/src/program.rs
View file

@ -702,7 +702,7 @@ pub fn handle_error_module(
pub fn handle_loading_problem(problem: LoadingProblem) -> std::io::Result<i32> {
match problem {
LoadingProblem::FormattedReport(report,_) => {
LoadingProblem::FormattedReport(report, _) => {
print!("{report}");
Ok(1)
}

2
crates/compiler/load/build.rs
View file

@ -88,7 +88,7 @@ fn write_types_for_module_real(module_id: ModuleId, filename: &str, output_path:
let mut module = match res_module {
Ok(v) => v,
Err(LoadingProblem::FormattedReport(report,None)) => {
Err(LoadingProblem::FormattedReport(report, None)) => {
internal_error!("{}", report);
}
Err(other) => {

2
crates/compiler/load/tests/test_reporting.rs
View file

@ -187,7 +187,7 @@ mod test_reporting {
let mut buf = String::new();
match infer_expr_help_new(subdir, arena, src) {
Err(LoadingProblem::FormattedReport(fail,_)) => fail,
Err(LoadingProblem::FormattedReport(fail, _)) => fail,
Ok((module_src, type_problems, can_problems, home, interns)) => {
let lines = LineInfo::new(&module_src);
let src_lines: Vec<&str> = module_src.split('\n').collect();

61
crates/compiler/load_internal/src/file.rs
View file

@ -1010,26 +1010,29 @@ impl<'a> LoadingProblem<'a> {
match self {
LoadingProblem::ParsingFailed(err) => err.problem.problem.get_region(),
LoadingProblem::MultiplePlatformPackages {
filename,
module_id,
source,
filename: _,
module_id: _,
source: _,
region,
} => Some(*region),
LoadingProblem::NoPlatformPackage {
filename,
module_id,
source,
filename: _,
module_id: _,
source: _,
region,
} => Some(*region),
LoadingProblem::UnrecognizedPackageShorthand {
filename,
module_id,
source,
filename: _,
module_id: _,
source: _,
region,
shorthand,
available,
shorthand: _,
available: _,
} => Some(*region),
LoadingProblem::FileProblem { filename, error } => None,
LoadingProblem::FileProblem {
filename: _,
error: _,
} => None,
LoadingProblem::UnexpectedHeader(_) => None,
LoadingProblem::ErrJoiningWorkerThreads => None,
LoadingProblem::TriedToImportAppModule => None,
@ -1215,7 +1218,7 @@ impl<'a> LoadStart<'a> {
})
.into_inner()
.into_module_ids();
let region=problem.get_region();
let region = problem.get_region();
let report = report_loading_problem(problem, module_ids, render, palette);
// TODO try to gracefully recover and continue
@ -1645,7 +1648,6 @@ fn state_thread_step<'a>(
msg_tx: &crossbeam::channel::Sender<Msg<'a>>,
msg_rx: &crossbeam::channel::Receiver<Msg<'a>>,
) -> Result<ControlFlow<LoadResult<'a>, State<'a>>, LoadingProblem<'a>> {
match msg_rx.try_recv() {
Ok(msg) => {
match msg {
@ -1709,11 +1711,11 @@ fn state_thread_step<'a>(
}
Msg::FailedToReadFile { filename, error } => {
let buf = to_file_problem_report_string(filename, error, true);
Err(LoadingProblem::FormattedReport(buf,None))
Err(LoadingProblem::FormattedReport(buf, None))
}
Msg::FailedToParse(problem) => {
let region=problem.problem.problem.get_region();
let region = problem.problem.problem.get_region();
let module_ids = (*state.arc_modules).lock().clone().into_module_ids();
let buf = to_parse_problem_report(
problem,
@ -1722,7 +1724,7 @@ fn state_thread_step<'a>(
state.render,
state.palette,
);
Err(LoadingProblem::FormattedReport(buf,region))
Err(LoadingProblem::FormattedReport(buf, region))
}
Msg::IncorrectModuleName(FileError {
problem: SourceError { problem, bytes },
@ -1737,7 +1739,7 @@ fn state_thread_step<'a>(
bytes,
state.render,
);
Err(LoadingProblem::FormattedReport(buf,Some(region)))
Err(LoadingProblem::FormattedReport(buf, Some(region)))
}
msg => {
// This is where most of the main thread's work gets done.
@ -1754,7 +1756,7 @@ fn state_thread_step<'a>(
match res_state {
Ok(new_state) => Ok(ControlFlow::Continue(new_state)),
Err(LoadingProblem::ParsingFailed(problem)) => {
let region=problem.problem.problem.get_region();
let region = problem.problem.problem.get_region();
let module_ids = Arc::try_unwrap(arc_modules)
.unwrap_or_else(|_| {
panic!(
@ -1786,7 +1788,7 @@ fn state_thread_step<'a>(
filename,
render,
);
return Err(LoadingProblem::FormattedReport(buf,None));
return Err(LoadingProblem::FormattedReport(buf, None));
}
Err(LoadingProblem::IncorrectModuleName(FileError {
problem: SourceError { problem, bytes },
@ -1803,7 +1805,7 @@ fn state_thread_step<'a>(
bytes,
render,
);
return Err(LoadingProblem::FormattedReport(buf,Some(region)));
return Err(LoadingProblem::FormattedReport(buf, Some(region)));
}
Err(LoadingProblem::UnrecognizedPackageShorthand {
filename,
@ -1827,7 +1829,7 @@ fn state_thread_step<'a>(
available,
render,
);
return Err(LoadingProblem::FormattedReport(buf,Some(region)));
return Err(LoadingProblem::FormattedReport(buf, Some(region)));
}
Err(e) => Err(e),
}
@ -1874,9 +1876,10 @@ pub fn report_loading_problem(
filename,
bytes,
render,
).0
)
.0
}
LoadingProblem::FormattedReport(report,region) => report,
LoadingProblem::FormattedReport(report, _region) => report,
LoadingProblem::FileProblem { filename, error } => {
to_file_problem_report_string(filename, error, true)
}
@ -3085,7 +3088,7 @@ fn register_package_shorthands<'a>(
Problem::InvalidUrl(url_err),
module_path.to_path_buf(),
);
return Err(LoadingProblem::FormattedReport(buf,None));
return Err(LoadingProblem::FormattedReport(buf, None));
}
}
}
@ -3203,7 +3206,7 @@ fn finish_specialization<'a>(
Valid(To::NewPackage(p_or_p)) => PathBuf::from(p_or_p.as_str()),
other => {
let buf = report_cannot_run(state.root_id, state.root_path, other);
return Err(LoadingProblem::FormattedReport(buf,None));
return Err(LoadingProblem::FormattedReport(buf, None));
}
};
@ -4168,7 +4171,9 @@ fn load_packages<'a>(
Err(problem) => {
let buf = to_https_problem_report_string(src, problem, filename);
load_messages.push(Msg::FailedToLoad(LoadingProblem::FormattedReport(buf,None)));
load_messages.push(Msg::FailedToLoad(LoadingProblem::FormattedReport(
buf, None,
)));
return;
}
}
@ -6486,7 +6491,7 @@ fn to_incorrect_module_name_report<'a>(
filename: PathBuf,
src: &'a [u8],
render: RenderTarget,
) -> (String,Region) {
) -> (String, Region) {
use roc_reporting::report::{Report, RocDocAllocator, DEFAULT_PALETTE};
use ven_pretty::DocAllocator;

4
crates/compiler/load_internal/tests/test_load.rs
View file

@ -141,7 +141,7 @@ fn multiple_modules(subdir: &str, files: Vec<(&str, &str)>) -> Result<LoadedModu
match multiple_modules_help(subdir, arena, files) {
Err(io_error) => panic!("IO trouble: {io_error:?}"),
Ok(Err(LoadingProblem::FormattedReport(buf, None))) => Err(buf),
Ok(Err(LoadingProblem::FormattedReport(buf, _))) => Err(buf),
Ok(Err(loading_problem)) => Err(format!("{loading_problem:?}")),
Ok(Ok(mut loaded_module)) => {
let home = loaded_module.module_id;
@ -247,7 +247,7 @@ fn load_fixture(
);
let mut loaded_module = match loaded {
Ok(x) => x,
Err(roc_load_internal::file::LoadingProblem::FormattedReport(report,None)) => {
Err(roc_load_internal::file::LoadingProblem::FormattedReport(report, _)) => {
println!("{report}");
panic!("{}", report);
}

88
crates/compiler/parse/src/parser.rs
View file

@ -65,7 +65,7 @@ pub enum SyntaxError<'a> {
}
impl<'a> SyntaxError<'a> {
pub fn get_region(&self) -> Option<Region> {
let region = match self {
match self {
SyntaxError::Unexpected(r) => Some(*r),
SyntaxError::Eof(r) => Some(*r),
SyntaxError::ReservedKeyword(r) => Some(*r),
@ -80,9 +80,8 @@ impl<'a> SyntaxError<'a> {
SyntaxError::Todo => None,
SyntaxError::InvalidPattern => None,
SyntaxError::BadUtf8 => None,
SyntaxError::Space(bad_input) => None,
};
region
SyntaxError::Space(_bad_input) => None,
}
}
}
pub trait SpaceProblem: std::fmt::Debug {
@ -158,18 +157,18 @@ pub enum EHeader<'a> {
impl<'a> EHeader<'a> {
pub fn get_region(&self) -> Region {
match self {
EHeader::Provides(provides, pos) => provides.get_region(),
EHeader::Params(params, pos) => params.get_region(),
EHeader::Provides(provides, _pos) => provides.get_region(),
EHeader::Params(params, _pos) => params.get_region(),
EHeader::Exposes(_, pos) => Region::from_pos(*pos),
EHeader::Imports(_, pos) => Region::from_pos(*pos),
EHeader::Requires(requires, pos) => requires.get_region(),
EHeader::Packages(packages, pos) => packages.get_region(),
EHeader::Requires(requires, _pos) => requires.get_region(),
EHeader::Packages(packages, _pos) => packages.get_region(),
EHeader::Space(_, pos) => Region::from_pos(*pos),
EHeader::Start(pos) => Region::from_pos(*pos),
EHeader::ModuleName(pos) => Region::from_pos(*pos),
EHeader::AppName(app_name, pos) => app_name.get_region(),
EHeader::PackageName(package_name, pos) => package_name.get_region(),
EHeader::PlatformName(platform_name, pos) => platform_name.get_region(),
EHeader::AppName(app_name, _pos) => app_name.get_region(),
EHeader::PackageName(package_name, _pos) => package_name.get_region(),
EHeader::PlatformName(platform_name, _pos) => platform_name.get_region(),
EHeader::IndentStart(pos) => Region::from_pos(*pos),
EHeader::InconsistentModuleName(region) => *region,
}
@ -566,7 +565,7 @@ impl<'a> EExpr<'a> {
EExpr::Ability(e_ability, _) => e_ability.get_region(),
EExpr::When(e_when, _) => e_when.get_region(),
EExpr::If(e_if, _) => e_if.get_region(),
EExpr::Expect(e_expect, _) => e_expect.get_region(),
EExpr::Expect(e_expect, _) => e_expect.get_region(),
EExpr::Dbg(e_expect, _) => e_expect.get_region(),
EExpr::Import(e_import, _) => e_import.get_region(),
EExpr::Return(e_return, _) => e_return.get_region(),
@ -650,7 +649,7 @@ impl<'a> EString<'a> {
match self {
// Case with child node that has get_region()
EString::Format(expr, _) => expr.get_region(),
// Cases with Position values
EString::Open(p)
| EString::CodePtOpen(p)
@ -699,7 +698,7 @@ impl<'a> ERecord<'a> {
match self {
// Cases with child node that has get_region()
ERecord::Expr(expr, _) => expr.get_region(),
// Cases with Position values
ERecord::End(p)
| ERecord::Open(p)
@ -735,7 +734,7 @@ impl<'a> EInParens<'a> {
match self {
// Cases with child node that has get_region()
EInParens::Expr(expr, _) => expr.get_region(),
// Cases with Position values
EInParens::End(p)
| EInParens::Open(p)
@ -766,7 +765,7 @@ impl<'a> EClosure<'a> {
// Cases with child nodes that have get_region()
EClosure::Pattern(pattern, _) => pattern.get_region(),
EClosure::Body(expr, _) => expr.get_region(),
// Cases with Position values
EClosure::Space(_, p)
| EClosure::Start(p)
@ -794,7 +793,7 @@ impl<'a> EList<'a> {
match self {
// Case with child node that has get_region()
EList::Expr(expr, _) => expr.get_region(),
// Cases with Position values
EList::Open(p) | EList::End(p) | EList::Space(_, p) => Region::from_pos(*p),
}
@ -865,7 +864,7 @@ impl<'a> EAbility<'a> {
match self {
// Case with child node that has get_region()
EAbility::Type(e_type, _) => e_type.get_region(),
// Cases with Position values
EAbility::Space(_, p)
| EAbility::DemandAlignment(_, p)
@ -897,7 +896,9 @@ pub enum EIf<'a> {
impl<'a> EIf<'a> {
pub fn get_region(&self) -> Region {
match self {
EIf::Condition(expr, _) | EIf::ThenBranch(expr, _) | EIf::ElseBranch(expr, _) => expr.get_region(),
EIf::Condition(expr, _) | EIf::ThenBranch(expr, _) | EIf::ElseBranch(expr, _) => {
expr.get_region()
}
EIf::Space(_, p)
| EIf::If(p)
| EIf::Then(p)
@ -945,9 +946,9 @@ impl<'a> EReturn<'a> {
pub fn get_region(&self) -> Region {
match self {
EReturn::ReturnValue(expr, _) => expr.get_region(),
EReturn::Space(_, p)
| EReturn::Return(p)
| EReturn::IndentReturnValue(p) => Region::from_pos(*p),
EReturn::Space(_, p) | EReturn::Return(p) | EReturn::IndentReturnValue(p) => {
Region::from_pos(*p)
}
}
}
}
@ -988,10 +989,10 @@ impl<'a> EImport<'a> {
// Cases with child nodes that have get_region()
EImport::Params(params, _) => params.get_region(),
EImport::Annotation(e_type, _) => e_type.get_region(),
// Case with direct Region value
EImport::LowercaseAlias(r) => *r,
// Cases with Position values
EImport::Import(p)
| EImport::IndentStart(p)
@ -1074,7 +1075,7 @@ impl<'a> EPattern<'a> {
EPattern::Record(expr, _) => expr.get_region(),
EPattern::List(expr, _) => expr.get_region(),
EPattern::PInParens(expr, _) => expr.get_region(),
// Cases with Position values
EPattern::AsKeyword(position)
| EPattern::AsIdentifier(position)
@ -1083,7 +1084,6 @@ impl<'a> EPattern<'a> {
| EPattern::Start(position)
| EPattern::End(position)
| EPattern::Space(_, position)
| EPattern::PInParens(_, position)
| EPattern::NumLiteral(_, position)
| EPattern::IndentStart(position)
| EPattern::IndentEnd(position)
@ -1115,7 +1115,7 @@ impl<'a> PRecord<'a> {
// Cases with child nodes that have get_region()
PRecord::Pattern(pattern, _) => pattern.get_region(),
PRecord::Expr(expr, _) => expr.get_region(),
// Cases with Position values
PRecord::End(p)
| PRecord::Open(p)
@ -1143,12 +1143,11 @@ impl<'a> PList<'a> {
match self {
// Case with child node that has get_region()
PList::Pattern(pattern, _) => pattern.get_region(),
// Cases with Position values
PList::End(p)
| PList::Open(p)
| PList::Rest(p)
| PList::Space(_, p) => Region::from_pos(*p),
PList::End(p) | PList::Open(p) | PList::Rest(p) | PList::Space(_, p) => {
Region::from_pos(*p)
}
}
}
}
@ -1168,7 +1167,7 @@ impl<'a> PInParens<'a> {
match self {
// Case with child node that has get_region()
PInParens::Pattern(pattern, _) => pattern.get_region(),
// Cases with Position values
PInParens::Empty(p)
| PInParens::End(p)
@ -1210,10 +1209,10 @@ impl<'a> EType<'a> {
EType::TRecord(expr, _) => expr.get_region(),
EType::TTagUnion(expr, _) => expr.get_region(),
EType::TInParens(expr, _) => expr.get_region(),
EType::TApply(eapply,_, )=> eapply.get_region(),
EType::TApply(eapply, _) => eapply.get_region(),
EType::TInlineAlias(einline, _) => einline.get_region(),
EType::TAbilityImpl(eability, _) => eability.get_region(),
// Cases with Position values
EType::Space(_, p)
| EType::UnderscoreSpacing(p)
@ -1255,7 +1254,7 @@ impl<'a> ETypeRecord<'a> {
match self {
// Case with child node that has get_region()
ETypeRecord::Type(type_expr, _) => type_expr.get_region(),
// Cases with Position values
ETypeRecord::End(p)
| ETypeRecord::Open(p)
@ -1286,11 +1285,11 @@ impl<'a> ETypeTagUnion<'a> {
match self {
// Case with child node that has get_region()
ETypeTagUnion::Type(type_expr, _) => type_expr.get_region(),
// Cases with Position values
ETypeTagUnion::End(p)
| ETypeTagUnion::Open(p)
| ETypeTagUnion::Space(_, p) => Region::from_pos(*p),
ETypeTagUnion::End(p) | ETypeTagUnion::Open(p) | ETypeTagUnion::Space(_, p) => {
Region::from_pos(*p)
}
}
}
}
@ -1317,15 +1316,14 @@ impl<'a> ETypeInParens<'a> {
match self {
// Cases with child nodes that have get_region()
ETypeInParens::Type(type_expr, _) => type_expr.get_region(),
// Cases with Position values
ETypeInParens::Empty(p)
| ETypeInParens::End(p)
| ETypeInParens::Open(p)
| ETypeInParens::Space(_, p)
| ETypeInParens::IndentOpen(p)
| ETypeInParens::IndentEnd(p) => Region::from_pos(*p),
| ETypeInParens::IndentEnd(p) => Region::from_pos(*p),
}
}
}
@ -1401,7 +1399,7 @@ impl<'a> ETypeAbilityImpl<'a> {
// Case with child node that has get_region()
ETypeAbilityImpl::Type(type_expr, _) => type_expr.get_region(),
ETypeAbilityImpl::Expr(expr, _) => expr.get_region(),
// Cases with Position values
// Cases with Position values
ETypeAbilityImpl::End(p)
| ETypeAbilityImpl::Open(p)
| ETypeAbilityImpl::Field(p)
@ -1409,12 +1407,10 @@ impl<'a> ETypeAbilityImpl<'a> {
| ETypeAbilityImpl::Colon(p)
| ETypeAbilityImpl::Arrow(p)
| ETypeAbilityImpl::Optional(p)
| ETypeAbilityImpl::Space(_, p)
| ETypeAbilityImpl::Prefix(p)
| ETypeAbilityImpl::QuestionMark(p)
| ETypeAbilityImpl::Ampersand(p)
| ETypeAbilityImpl::IndentBar(p)
| ETypeAbilityImpl::IndentAmpersand(p) => Region::from_pos(*p),
}

1
crates/compiler/test_gen/src/helpers/llvm.rs
View file

@ -91,6 +91,7 @@ fn create_llvm_module<'a>(
Ok(x) => x,
Err(LoadMonomorphizedError::LoadingProblem(roc_load::LoadingProblem::FormattedReport(
report,
_,
))) => {
println!("{report}");
panic!();

3
crates/compiler/test_mono/src/tests.rs
View file

@ -172,7 +172,8 @@ fn compiles_to_ir(test_name: &str, src: &str, mode: &str, allow_type_errors: boo
let mut loaded = match loaded {
Ok(x) => x,
Err(LoadMonomorphizedError::LoadingProblem(roc_load::LoadingProblem::FormattedReport(
report,_
report,
_,
))) => {
println!("{report}");
panic!();

3
crates/compiler/uitest/src/mono.rs
View file

@ -63,7 +63,8 @@ pub(crate) fn write_compiled_ir<'a>(
let loaded = match loaded {
Ok(x) => x,
Err(LoadMonomorphizedError::LoadingProblem(roc_load::LoadingProblem::FormattedReport(
report,_
report,
_,
))) => {
println!("{report}");
panic!();

2
crates/docs/src/lib.rs
View file

@ -674,7 +674,7 @@ pub fn load_module_for_docs(filename: PathBuf) -> LoadedModule {
load_config,
) {
Ok(loaded) => loaded,
Err(LoadingProblem::FormattedReport(report,_)) => {
Err(LoadingProblem::FormattedReport(report, _)) => {
eprintln!("{report}");
std::process::exit(1);
}

13
crates/language_server/src/convert.rs
View file

@ -1,7 +1,3 @@
use std::any::Any;
use roc_load::LoadingProblem;
use roc_parse::parser::{EHeader, EPattern, EType, SourceError, SyntaxError};
use roc_region::all::{LineColumn, LineColumnRegion, LineInfo, Region};
use tower_lsp::lsp_types::{Position, Range};
@ -73,7 +69,7 @@ impl ToRocPosition for tower_lsp::lsp_types::Position {
}
pub(crate) mod diag {
use std::{fmt::Debug, path::Path};
use std::path::Path;
use log::debug;
use roc_load::LoadingProblem;
@ -82,7 +78,7 @@ pub(crate) mod diag {
use roc_problem::Severity;
use roc_reporting::report::RocDocAllocator;
use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity, Position, Range};
use tower_lsp::lsp_types::{Diagnostic, DiagnosticSeverity};
use super::ToRange;
@ -110,7 +106,7 @@ pub(crate) mod diag {
type Feed = LineInfo;
fn into_lsp_diagnostic(self, line_info: &LineInfo) -> Option<Diagnostic> {
let mut range = self
let range = self
.get_region()
.unwrap_or(Region::new(
roc_region::all::Position::new(0),
@ -156,8 +152,7 @@ pub(crate) mod diag {
LoadingProblem::TriedToImportAppModule => {
"Attempted to import app module".to_string()
}
LoadingProblem::FormattedReport(report, region) =>
report.clone(),
LoadingProblem::FormattedReport(report, _region) => report.clone(),
LoadingProblem::ImportCycle(_, _) => {
"Circular dependency between modules".to_string()
}

2
crates/repl_eval/src/gen.rs
View file

@ -80,7 +80,7 @@ pub fn compile_to_mono<'a, 'i, I: Iterator<Item = &'i str>>(
(m.can_problems, m.type_problems)
);
}
Err(LoadMonomorphizedError::LoadingProblem(LoadingProblem::FormattedReport(report,_))) => {
Err(LoadMonomorphizedError::LoadingProblem(LoadingProblem::FormattedReport(report, _))) => {
return (
None,
Problems {

2
crates/valgrind_tests/src/lib.rs
View file

@ -164,7 +164,7 @@ fn valgrind_test_linux(source: &str) {
run_with_valgrind(&binary_path);
}
Err(roc_build::program::BuildFileError::LoadingProblem(
roc_load::LoadingProblem::FormattedReport(report),
roc_load::LoadingProblem::FormattedReport(report, _),
)) => {
eprintln!("{report}");
panic!("");