[lint] Update license requirement. Added 'Move contributors' license …

…to all files (anza-xyz#120)

* [lint] Update license requirement

- Files must now have the Move Contributors license header
- Optionally, they can have the Diem Core Contributors header first

* fixup! [lint] Update license requirement

.github/actions/slack-file/message_file_to_slack.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 # Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
 # SPDX-License-Identifier: Apache-2.0
 
 function echoerr() {

devtools/x-core/src/core_config.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use serde::{Deserialize, Serialize};

devtools/x-core/src/errors.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use camino::{Utf8Path, Utf8PathBuf};

devtools/x-core/src/git.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::errors::*;

devtools/x-core/src/graph.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{Result, SystemError, WorkspaceSubsets, XCoreContext};

devtools/x-core/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{core_config::XCoreConfig, git::GitCli};

devtools/x-core/src/workspace_subset.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{core_config::SubsetConfig, Result, SystemError};

devtools/x-lint/src/content.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{prelude::*, LintContext};

devtools/x-lint/src/file_path.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{prelude::*, LintContext};

devtools/x-lint/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 //! Lint engine.

devtools/x-lint/src/package.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{prelude::*, LintContext};

devtools/x-lint/src/project.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{prelude::*, LintContext};

devtools/x-lint/src/runner.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{prelude::*, LintContext};

devtools/x/src/bench.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/build.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 use crate::{
     cargo::{build_args::BuildArgs, selected_package::SelectedPackageArgs, CargoCommand},

devtools/x/src/cargo.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/cargo/build_args.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::{ArgEnum, Parser};

devtools/x/src/cargo/selected_package.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{changed_since::changed_since_impl, context::XContext, Result};

devtools/x/src/changed_since.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{context::XContext, Result};

devtools/x/src/check.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/clippy.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/config.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{utils::project_root, Result};

devtools/x/src/context.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/diff_summary.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::context::XContext;

devtools/x/src/fix.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/fmt.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{cargo::Cargo, context::XContext, Result};

devtools/x/src/generate_summaries.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::context::XContext;

devtools/x/src/generate_workspace_hack.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{cargo::Cargo, context::XContext, Result};

devtools/x/src/installer.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/lint/allowed_paths.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Context;

devtools/x/src/lint/determinator.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Context;

devtools/x/src/lint/guppy.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 //! Project and package linters that run queries on guppy.

devtools/x/src/lint/license.rs

@@ -1,29 +1,31 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use x_lint::prelude::*;
 
-static ALLOWED_LICENSE_HEADERS: &[&str] = &[
-    "Copyright (c) The Move Contributors\n\
-    SPDX-License-Identifier: Apache-2.0\n\
-    ",
-    "Copyright (c) The Diem Core Contributors\n\
-    SPDX-License-Identifier: Apache-2.0\n\
-    ",
-    "Copyright (c) The Move Contributors\n\
-    Copyright (c) The Diem Core Contributors\n\
-    SPDX-License-Identifier: Apache-2.0\n\
-    ",
-];
+static DIEM_CORE_CONTRIBUTORS: &str = "Copyright (c) The Diem Core Contributors";
+static MOVE_CONTRIBUTORS: &str = "Copyright (c) The Move Contributors";
+static LICENSE_IDENTIFIER: &str = "SPDX-License-Identifier: Apache-2.0";
 
-fn has_license<'a>(maybe_license: impl Iterator<Item = &'a str>) -> bool {
-    let maybe = maybe_license.collect::<Vec<_>>();
-    for allowed in ALLOWED_LICENSE_HEADERS {
-        if allowed.lines().eq(maybe.clone().into_iter()) {
-            return true;
+fn has_license<'a>(mut lines: impl Iterator<Item = &'a str>) -> bool {
+    let first = match lines.next() {
+        Some(line) => line,
+        None => return false,
+    };
+    let maybe_move_line = if first == DIEM_CORE_CONTRIBUTORS {
+        match lines.next() {
+            Some(line) => line,
+            None => return false,
         }
-    }
-    false
+    } else {
+        first
+    };
+    let maybe_license_identifier = match lines.next() {
+        Some(line) => line,
+        None => return false,
+    };
+    maybe_move_line == MOVE_CONTRIBUTORS && maybe_license_identifier == LICENSE_IDENTIFIER
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -67,7 +69,6 @@ impl ContentLinter for LicenseHeader {
                 let maybe_license = content
                     .lines()
                     .skip_while(|line| line.is_empty())
-                    .take(2)
                     .map(|s| s.trim_start_matches("// "));
                 !has_license(maybe_license)
             }
@@ -76,7 +77,6 @@ impl ContentLinter for LicenseHeader {
                     .lines()
                     .skip_while(|line| line.starts_with("#!"))
                     .skip_while(|line| line.is_empty())
-                    .take(2)
                     .map(|s| s.trim_start_matches("# "));
                 !has_license(maybe_license)
             }

devtools/x/src/lint/mod.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::context::XContext;

devtools/x/src/lint/toml.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use camino::Utf8Path;

devtools/x/src/lint/whitespace.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Context;

devtools/x/src/lint/workspace_classify.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::config::TestOnlyConfig;

devtools/x/src/main.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]

devtools/x/src/nextest.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/playground.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 //! Playground for arbitrary code.

devtools/x/src/test.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{

devtools/x/src/tools.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{context::XContext, Result};

devtools/x/src/utils.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{config::CargoConfig, installer::install_cargo_component_if_needed, Result};

language/benchmarks/benches/vm_benches.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use criterion::{criterion_group, criterion_main, measurement::Measurement, Criterion};

language/benchmarks/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]

language/benchmarks/src/measurement.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use criterion::Criterion;

language/benchmarks/src/move_vm.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use criterion::{measurement::Measurement, Criterion};

language/documentation/examples/diem-framework/build_all.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 # Copyright (c) The Diem Core Contributors
+# Copyright (c) The Move Contributors
 # SPDX-License-Identifier: Apache-2.0
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

language/documentation/examples/diem-framework/crates/cli/src/main.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::Result;

language/documentation/examples/diem-framework/crates/crypto-derive/src/hasher.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 /// Converts a camel-case string to snake-case

language/documentation/examples/diem-framework/crates/crypto-derive/src/lib.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 #![forbid(unsafe_code)]

language/documentation/examples/diem-framework/crates/crypto-derive/src/unions.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use proc_macro::TokenStream;

language/documentation/examples/diem-framework/crates/crypto/benches/ed25519.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 #[macro_use]

language/documentation/examples/diem-framework/crates/crypto/benches/noise.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 //! Don't forget to run this benchmark with AES-NI enable.

language/documentation/examples/diem-framework/crates/crypto/src/compat.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 //! Wrapper structs for types that need [RustCrypto](https://github.com/RustCrypto)

language/documentation/examples/diem-framework/crates/crypto/src/ed25519.rs

@@ -1,4 +1,5 @@
 // Copyright (c) The Diem Core Contributors
+// Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
 //! This module provides an API for the PureEdDSA signature scheme over the ed25519 twisted