language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 15:51:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix some typos

Browse source
This commit is contained in:
Folkert 2020-11-08 00:20:00 +01:00
parent e516a0aebb
commit 114e08f05f
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/load/src/file.rs
View file

@ -44,7 +44,7 @@ use std::time::{Duration, SystemTime};
const ROC_FILE_EXTENSION: &str = "roc"; const ROC_FILE_EXTENSION: &str = "roc";
/// Roc-Config file name /// Roc-Config file name
const ROC_CONFIG_FILE_NAME: &str = "Pkg-Config"; const PKG_CONFIG_FILE_NAME: &str = "Pkg-Config";
/// The . in between module names like Foo.Bar.Baz /// The . in between module names like Foo.Bar.Baz
const MODULE_SEPARATOR: char = '.'; const MODULE_SEPARATOR: char = '.';
@ -130,6 +130,7 @@ impl Dependencies {
// all the dependencies can be loaded // all the dependencies can be loaded
for dep in dependencies { for dep in dependencies {
// TODO figure out how to "load" (because it doesn't exist on the file system) the Effect module
if !format!("{:?}", dep).contains("Effect") { if !format!("{:?}", dep).contains("Effect") {
output.insert((*dep, LoadHeader)); output.insert((*dep, LoadHeader));
} }
@ -1739,7 +1740,7 @@ fn load_pkg_config<'a>(
let mut filename = PathBuf::from(src_dir); let mut filename = PathBuf::from(src_dir);
filename.push("platform"); filename.push("platform");
filename.push(ROC_CONFIG_FILE_NAME); filename.push(PKG_CONFIG_FILE_NAME);
// End with .roc // End with .roc
filename.set_extension(ROC_FILE_EXTENSION); filename.set_extension(ROC_FILE_EXTENSION);
@ -1900,9 +1901,10 @@ fn parse_header<'a>(
module_timing, module_timing,
); );
// check whether we can find a Pkg-Config.roc file
let mut pkg_config_roc = pkg_config_dir.clone(); let mut pkg_config_roc = pkg_config_dir.clone();
pkg_config_roc.push("platform"); pkg_config_roc.push("platform");
pkg_config_roc.push(ROC_CONFIG_FILE_NAME); pkg_config_roc.push(PKG_CONFIG_FILE_NAME);
pkg_config_roc.set_extension(ROC_FILE_EXTENSION); pkg_config_roc.set_extension(ROC_FILE_EXTENSION);
if pkg_config_roc.as_path().exists() { if pkg_config_roc.as_path().exists() {