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

Various routine maintenance tasks #263

Merged
merged 3 commits into from
Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
# informationally check the latest as well. We should
# regularly update the known good once we know that tests
# pass on it
rust-toolchain: [ 1.75, stable, nightly ]
rust-toolchain: [ 1.77, stable, nightly ]
steps:
- uses: actions/checkout@v3
- name: Setup
Expand All @@ -37,9 +37,9 @@ jobs:
- name: Check clippy
id: clippy
run: .github/workflows/clippy.sh ${{ matrix.rust-toolchain }}
continue-on-error: ${{ matrix.rust-toolchain != '1.75' }}
continue-on-error: ${{ matrix.rust-toolchain != '1.77' }}
- name: Store clippy flag
if: (matrix.rust-toolchain != '1.75')
if: (matrix.rust-toolchain != '1.77')
run: |
mkdir -p ./clippy-${{ matrix.rust-toolchain }}
if [[ ${{ steps.clippy.outcome }} == "success" ]] ; then \
Expand All @@ -49,7 +49,7 @@ jobs:
fi
echo ${{ github.event.number }} > ./clippy-${{ matrix.rust-toolchain }}/issue_num
- uses: actions/upload-artifact@v3
if: (matrix.rust-toolchain != '1.75')
if: (matrix.rust-toolchain != '1.77')
with:
name: clippy-${{ matrix.rust-toolchain }}
path: clippy-${{ matrix.rust-toolchain }}/
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ codespan-reporting = "0.11"
flate2 = "1"
is-terminal = "0.4"
lalrpop-util = { version="0.20", default_features=false, features = ["lexer"] }
quick-xml = "0.30"
quick-xml = "0.31"
sexp = "1.1"
tar = "0.4"
termcolor = "1.1"
Expand Down
2 changes: 1 addition & 1 deletion src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,7 @@ impl<'a> FunctionArgument<'a> {
None,
)?;

ret.default_value = declared_arg.default.clone();
ret.default_value.clone_from(&declared_arg.default);
}
Ok(ret)
}
Expand Down
2 changes: 1 addition & 1 deletion src/internal_rep.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1431,7 +1431,7 @@ impl<'a> ClassList<'a> {
if class == "any" {
return true;
}
self.classes.get(class).is_some()
self.classes.contains_key(class)
}

pub fn is_perm(&self, perm: &str, context: &BlockContext) -> bool {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ pub fn compile_combined(
let errors = CascadeErrors::new();
let policies = get_policies(input_files)?;
let mut res = compile_machine_policies_internal(policies, vec!["out".to_string()], true)?;
let ret = match res.remove(&"out".to_string()) {
let ret = match res.remove("out") {
Some(s) => s,
None => return Err(CascadeErrors::from(InternalError::new())),
};
Expand Down
Loading