You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by xu...@apache.org on 2023/03/18 14:19:39 UTC
[incubator-opendal] branch main updated: chore: Remove not needed ignore from licenserc (#1677)
This is an automated email from the ASF dual-hosted git repository.
xuanwo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
The following commit(s) were added to refs/heads/main by this push:
new 4bd633f3 chore: Remove not needed ignore from licenserc (#1677)
4bd633f3 is described below
commit 4bd633f3a7a96d6a0c4a08bb9567d11d79defa04
Author: Xuanwo <gi...@xuanwo.io>
AuthorDate: Sat Mar 18 22:19:34 2023 +0800
chore: Remove not needed ignore from licenserc (#1677)
* Cleanup
Signed-off-by: Xuanwo <gi...@xuanwo.io>
* Remove not needed ignore
Signed-off-by: Xuanwo <gi...@xuanwo.io>
* Remove not needed license ignore
Signed-off-by: Xuanwo <gi...@xuanwo.io>
* Format code
Signed-off-by: Xuanwo <gi...@xuanwo.io>
---------
Signed-off-by: Xuanwo <gi...@xuanwo.io>
---
.config/nextest.toml | 17 +++++++++++++++++
.taplo.toml | 17 +++++++++++++++++
.typos.toml | 17 +++++++++++++++++
bindings/c/src/lib.rs | 3 ++-
bindings/object_store/rustfmt.toml | 8 --------
bindings/python/src/asyncio.rs | 6 +++++-
core/src/services/azblob/backend.rs | 4 ++--
core/src/services/azblob/batch.rs | 9 +++++----
core/src/services/azdfs/backend.rs | 4 ++--
licenserc.toml | 31 +++++++++----------------------
rust-toolchain.toml | 17 +++++++++++++++++
rustfmt.toml | 17 +++++++++++++++++
vercel.json | 8 --------
13 files changed, 110 insertions(+), 48 deletions(-)
diff --git a/.config/nextest.toml b/.config/nextest.toml
index 572f6e28..fe1754ad 100644
--- a/.config/nextest.toml
+++ b/.config/nextest.toml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[profile.default]
fail-fast = false
slow-timeout = { period = "60s", terminate-after = 2 }
diff --git a/.taplo.toml b/.taplo.toml
index 583da20d..0a6b2a13 100644
--- a/.taplo.toml
+++ b/.taplo.toml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
include = ["Cargo.toml", "**/*.toml"]
[formatting]
diff --git a/.typos.toml b/.typos.toml
index 89d10f5c..1c2549c9 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[default.extend-words]
# Random strings.
"ba" = "ba"
diff --git a/bindings/c/src/lib.rs b/bindings/c/src/lib.rs
index b3f10b17..814db98c 100644
--- a/bindings/c/src/lib.rs
+++ b/bindings/c/src/lib.rs
@@ -15,7 +15,8 @@
// specific language governing permissions and limitations
// under the License.
-use opendal::{services::Memory, Operator};
+use opendal::services::Memory;
+use opendal::Operator;
/// Hello, OpenDAL!
#[no_mangle]
diff --git a/bindings/object_store/rustfmt.toml b/bindings/object_store/rustfmt.toml
deleted file mode 100644
index e50f444c..00000000
--- a/bindings/object_store/rustfmt.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-edition = "2021"
-reorder_imports = true
-# format_code_in_doc_comments = true
-# imports_granularity = "Item"
-# group_imports = "StdExternalCrate"
-# where_single_line = true
-# trailing_comma = "Vertical"
-# overflow_delimited_expr = true
diff --git a/bindings/python/src/asyncio.rs b/bindings/python/src/asyncio.rs
index dcfbbbed..2666799d 100644
--- a/bindings/python/src/asyncio.rs
+++ b/bindings/python/src/asyncio.rs
@@ -34,7 +34,11 @@ use tokio::io::AsyncReadExt;
use tokio::io::AsyncSeekExt;
use tokio::sync::Mutex;
-use crate::{build_operator, format_pyerr, layers, Entry, Metadata};
+use crate::build_operator;
+use crate::format_pyerr;
+use crate::layers;
+use crate::Entry;
+use crate::Metadata;
/// `AsyncOperator` is the entry for all public async APIs
///
diff --git a/core/src/services/azblob/backend.rs b/core/src/services/azblob/backend.rs
index b749e070..c194be5d 100644
--- a/core/src/services/azblob/backend.rs
+++ b/core/src/services/azblob/backend.rs
@@ -845,9 +845,9 @@ impl AzblobBackend {
#[cfg(test)]
mod tests {
- use crate::{services::azblob::backend::infer_storage_name_from_endpoint, Builder};
-
use super::AzblobBuilder;
+ use crate::services::azblob::backend::infer_storage_name_from_endpoint;
+ use crate::Builder;
#[test]
fn test_infer_storage_name_from_endpoint() {
diff --git a/core/src/services/azblob/batch.rs b/core/src/services/azblob/batch.rs
index 76615951..8386aa16 100644
--- a/core/src/services/azblob/batch.rs
+++ b/core/src/services/azblob/batch.rs
@@ -15,18 +15,18 @@
// specific language governing permissions and limitations
// under the License.
-use bytes::{BufMut, BytesMut};
+use bytes::BufMut;
+use bytes::BytesMut;
use http::header::CONTENT_LENGTH;
use http::header::CONTENT_TYPE;
use http::Request;
use http::StatusCode;
use uuid::Uuid;
+use super::error::parse_http_error;
use crate::raw::*;
use crate::*;
-use super::error::parse_http_error;
-
const AZURE_BATCH_LIMIT: usize = 256;
/// helper struct for batch requests
@@ -180,7 +180,8 @@ mod test {
use anyhow::anyhow;
use anyhow::Result;
use http::header::CONTENT_LENGTH;
- use http::{header::CONTENT_TYPE, Request};
+ use http::header::CONTENT_TYPE;
+ use http::Request;
use super::BatchDeleteRequestBuilder;
use crate::raw::AsyncBody;
diff --git a/core/src/services/azdfs/backend.rs b/core/src/services/azdfs/backend.rs
index 91533afc..f750d103 100644
--- a/core/src/services/azdfs/backend.rs
+++ b/core/src/services/azdfs/backend.rs
@@ -643,9 +643,9 @@ fn infer_storage_name_from_endpoint(endpoint: &str) -> Option<String> {
#[cfg(test)]
mod tests {
- use crate::{services::azdfs::backend::infer_storage_name_from_endpoint, Builder};
-
use super::AzdfsBuilder;
+ use crate::services::azdfs::backend::infer_storage_name_from_endpoint;
+ use crate::Builder;
#[test]
fn test_infer_storage_name_from_endpoint() {
diff --git a/licenserc.toml b/licenserc.toml
index fee37991..2428610f 100644
--- a/licenserc.toml
+++ b/licenserc.toml
@@ -18,32 +18,19 @@
headerPath = "Apache-2.0-ASF.txt"
excludes = [
- "**/*.toml",
- "!**/Cargo.toml",
- "!**/licenserc.toml",
- "!**/pyproject.toml",
-
- # Generated files
+ # Well known generated files
"**/Cargo.lock",
"**/yarn.lock",
- "**/fixtures/**",
- "tests/data/**",
- "bindings/nodejs/.npmignore",
- "bindings/nodejs/.prettierignore",
- "bindings/nodejs/generated*.*",
- "**/*.node",
- "bindings/python/test_requirements.txt",
- "bindings/python/opendal.pyi",
- "**/__pycache__",
- "**/.pytest_cache",
+
+ # Python binding related files
"**/venv/**",
- "website/build/**",
- "website/static/.nojekyll",
- "website/.docusaurus",
- # Files that doesn't need license.
- ".env.example",
- ".env",
+ # Nodejs binding related files
+ "bindings/nodejs/generated*.*",
+
+ # Website generated files
+ "website/build",
+ "website/.docusaurus",
# ascii is licensed under MIT from memcache-async
"core/src/services/memcached/MIT-ascii.txt",
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 73cb934d..870d7eb7 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
[toolchain]
channel = "stable"
components = ["rustfmt", "clippy"]
diff --git a/rustfmt.toml b/rustfmt.toml
index e50f444c..ec3c4bc3 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
edition = "2021"
reorder_imports = true
# format_code_in_doc_comments = true
diff --git a/vercel.json b/vercel.json
deleted file mode 100644
index cb13d86b..00000000
--- a/vercel.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "redirects": [
- {
- "source": "/",
- "destination": "/opendal/"
- }
- ]
-}