]> Repositorios git - scryer-prolog.git/commitdiff
Merge branch 'master' into dependabot/cargo/tokio-1.23.1 dependabot/cargo/tokio-1.23.1 origin/dependabot/cargo/tokio-1.23.1
authorMark Thom <[email protected]>
Tue, 24 Jan 2023 22:02:09 +0000 (23:02 +0100)
committerGitHub <[email protected]>
Tue, 24 Jan 2023 22:02:09 +0000 (23:02 +0100)
1  2 
src/codegen.rs
src/machine/dispatch.rs

diff --cc src/codegen.rs
index c44ce84343d55198c93176b61a47398879ec6270,1aea58d2b8f23887cf7ccfa6869e4681e534ea00..56813353e67b5cf9df747dd2eacf5daeb4277844
@@@ -395,11 -361,11 +361,11 @@@ impl<'b> CodeGenerator<'b> 
          &mut self,
          iter: Iter,
          term_loc: GenContext,
-         is_exposed: bool,
      ) -> Code
      where
 -        Target: crate::targets::CompilationTarget<'a>,
 +        Target: crate::targets::CompilationTarget<'a> + ConsCompile<'a>,
          Iter: Iterator<Item = TermRef<'a>>,
+         CodeGenerator<'b>: AddToFreeList<'a, Target>
      {
          let mut target: Code = Vec::new();
  
Simple merge