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

Few Rust fixes #726

Merged
merged 1 commit into from
Sep 26, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Default owners (lowest precedence).
* @reyammer @invernizzi @ia0
* @reyammer @invernizzi

# Julien owns the Rust code
/rust/ @ia0
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/rust-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # pin@v4
- run: rustup default ${{ matrix.toolchain }}
- run: rustup component add rustfmt clippy
- run: rustup target add aarch64-apple-darwin x86_64-pc-windows-msvc
- run: ./test.sh
working-directory: rust
run:
Expand Down
2 changes: 2 additions & 0 deletions rust/cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ struct Experimental {
parallel_execution: Option<bool>,
}

// TODO(https://github.com/rust-lang/rust-clippy/issues/13458): Remove when fixed.
#[allow(clippy::needless_return)]
#[tokio::main]
async fn main() -> Result<()> {
let flags = Arc::new(Flags::parse());
Expand Down
10 changes: 0 additions & 10 deletions rust/lib/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,3 @@ x cargo clippy -- --deny=warnings
if cargo --version | grep -q nightly; then
x env RUSTDOCFLAGS=--deny=warnings cargo doc --features=_doc
fi

# Make sure we can build for the targets we care about.
TARGETS='
x86_64-unknown-linux-gnu
aarch64-apple-darwin
x86_64-pc-windows-msvc
'
for target in $TARGETS; do
x cargo build --release --target=$target
done
3 changes: 2 additions & 1 deletion rust/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ set -e
[ -z "$(git status -s)" ] || error "Repository is not clean"

info "Removing all -dev suffixes (if any)"
sed -i 's/-dev"/"/' $(git ls-files '*/'{Cargo.{toml,lock},CHANGELOG.md})
sed -i 's/-dev"/"/' $(git ls-files '*/Cargo.*')
sed -i 's/-dev//' $(git ls-files '*/CHANGELOG.md')
if [ -n "$(git status -s)" ]; then
info "Creating a commit with those changes"
git commit -aqm'Release Rust crates'
Expand Down
Loading