Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Correct several issues found during #4740 #4786

Merged
merged 9 commits into from
May 25, 2022
Merged

Conversation

Marwes
Copy link
Contributor

@Marwes Marwes commented May 24, 2022

Various fixes and refactorings I have done so for for #4740 . Reviewing commit by commit is recommended.

@Marwes Marwes marked this pull request as ready for review May 24, 2022 17:10
@Marwes Marwes requested a review from a team as a code owner May 24, 2022 17:10
@Marwes Marwes requested review from skartikey and removed request for a team May 24, 2022 17:10
@@ -43,10 +43,16 @@ pub type SemanticPackageMap = SemanticMap<String, Package>;
/// Infers the Flux standard library given the path to the source code.
/// The prelude and the imports are returned.
#[allow(clippy::type_complexity)]
pub fn infer_stdlib_dir(path: &Path) -> Result<(PackageExports, Packages, SemanticPackageMap)> {
pub fn infer_stdlib_dir(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the second argument needs to be supplied here as well. else it will return an error.

let (prelude, _, _) = bootstrap::infer_stdlib_dir(Path::new("../../stdlib")).unwrap();

@@ -43,10 +43,16 @@ pub type SemanticPackageMap = SemanticMap<String, Package>;
/// Infers the Flux standard library given the path to the source code.
/// The prelude and the imports are returned.
#[allow(clippy::type_complexity)]
pub fn infer_stdlib_dir(path: &Path) -> Result<(PackageExports, Packages, SemanticPackageMap)> {
pub fn infer_stdlib_dir(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the second argument needs to be supplied here as well. else it will return an error.

let (prelude, _, _) = bootstrap::infer_stdlib_dir(Path::new("../../stdlib")).unwrap();

@Marwes Marwes merged commit 6acd449 into master May 25, 2022
@Marwes Marwes deleted the fix_typechecks branch May 25, 2022 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants