Cleaning up some things

move-language · May 1, 2024 · 39ebdc0 · 39ebdc0
1 parent a652b87
commit 39ebdc0
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 322 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 
 Move is a programming language for writing safe smart contracts originally developed at Facebook to power the Diem blockchain. Move is designed to be a platform-agnostic language to enable common libraries, tooling, and developer communities across diverse blockchains with vastly different data and execution models.
 
-This repository is a mirror of *Move on Aptos*, a natural evolution of the Move language how it was originally intended. The repository contains the generic part of the Move language and implementation as it is used on the [Aptos Network](https://aptosfoundation.org/) and on other networks. Major components of the implementation include 
+This repository is a mirror of *Move on Aptos*, a natural evolution of the Move language how it was originally designed. The repository contains the generic part of the Move language and implementation as it is used on the [Aptos Network](https://aptosfoundation.org/) and on other networks. Major components of the implementation include 
 the Move virtual machine, bytecode verifier, compiler, prover, and package manager.
 
 For an introduction into the Move language, please check out the following resources:
@@ -17,7 +17,7 @@ For an introduction into the Move language, please check out the following resou
 
 > *NOTE* If you have an issue with Move on Aptos while working with Aptos, please open it [here](https://github.com/aptos-labs/aptos-core/issues/new/choose) and not in this repo.
 
-# Consuming and Contributing
+# Consuming and Contributing to Move
 
 The repository mirrors the content of the `aptos-core` repo, subtree [`third_party/move`](https://github.com/aptos-labs/aptos-core/tree/main/third_party/move). By consuming this repo, one can avoid cloning the large aptos-core repo. The repo is updated on a monthly basis with the newest changes from aptos-core.
 

diff --git a/SECURITY.md b/SECURITY.md
@@ -1,3 +1,3 @@
 # Security Policies and Procedures
 
-Please do NOT report a security problem via GitHub issues. Instead, send a report to build@mystenlabs.com.
+Please do NOT report a security problem via GitHub issues. Instead, see [the Aptos bug bounty program](https://github.com/aptos-labs/aptos-core/blob/main/SECURITY.md) -- you might be eligible for a bounty.
diff --git a/docker/ci/github/Dockerfile b/docker/ci/github/Dockerfile
diff --git a/docker/move-cli/Dockerfile b/docker/move-cli/Dockerfile
diff --git a/scripts/check_pr.sh b/scripts/check_pr.sh
@@ -85,9 +85,9 @@ if [ ! -z "$CHECK" ]; then
   echo "*************** [check-pr] Running checks"
   (
     cd $BASE
-    cargo xlint
-    cargo xclippy --workspace --all-targets
-    cargo xfmt
+    cargo x clippy --workspace --all-targets
+    cargo +nightly fmt
+    cargo sort --grouped --workspace
   )
 fi
 

diff --git a/scripts/rust_lint.sh b/scripts/rust_lint.sh
@@ -25,7 +25,7 @@ fi
 set -e
 set -x
 
-cargo xclippy
+cargo x clippy
 
 # We require the nightly build of cargo fmt
 # to provide stricter rust formatting.