Skip to content

Commit f60b4da

Browse files
committed
Minor improvements and upgraded to actions/upload-artifact v4
1 parent 32c9141 commit f60b4da

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Diff for: .github/workflows/remoteBuild.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
files: adept
127127
outPath: ${{github.workspace}}/build-${{ matrix.os }}.tar.gz
128128
- name: Upload Build Artifact
129-
uses: actions/upload-artifact@v3
129+
uses: actions/upload-artifact@v4
130130
with:
131131
name: build-${{ matrix.os }}-archive
132132
path: build-${{ matrix.os }}.tar.gz

Diff for: src/resolve/polymorph/matcher.rs

+1
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ impl<'local, 'ast, 'root_ctx> TypeMatcher<'local, 'ast, 'root_ctx> {
150150

151151
pub fn put_type(&mut self, name: &str, new_type: &Type) -> Result<(), PolyCatalogInsertError> {
152152
let in_parent = self.parent.get(name);
153+
153154
if let Some(existing) = in_parent.or_else(|| self.partial.get(name)) {
154155
match existing {
155156
PolyValue::Type(poly_type) => {

0 commit comments

Comments
 (0)