Skip to content

Commit e328c70

Browse files
authored
chore: udapte Rust toolchain to 2024-10-19 (#4857)
* update rust toolchain * change toolchain to 2024-10-17 * fix: clippy * fix: ut * bump shadow-rs * fix: use nightly-2024-10-19 * fix: clippy * chore/udapte-toolchain-2024-10-17: Update DEV_BUILDER_IMAGE_TAG to 2024-10-19-a5c00e85-20241024184445 in Makefile
1 parent 8b307e4 commit e328c70

File tree

94 files changed

+181
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+181
-164
lines changed

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ schemars = "0.8"
169169
serde = { version = "1.0", features = ["derive"] }
170170
serde_json = { version = "1.0", features = ["float_roundtrip"] }
171171
serde_with = "3"
172-
shadow-rs = "0.31"
172+
shadow-rs = "0.35"
173173
similar-asserts = "1.6.0"
174174
smallvec = { version = "1", features = ["serde"] }
175175
snafu = "0.8"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CARGO_BUILD_OPTS := --locked
88
IMAGE_REGISTRY ?= docker.io
99
IMAGE_NAMESPACE ?= greptime
1010
IMAGE_TAG ?= latest
11-
DEV_BUILDER_IMAGE_TAG ?= 2024-06-06-5674c14f-20240920110415
11+
DEV_BUILDER_IMAGE_TAG ?= 2024-10-19-a5c00e85-20241024184445
1212
BUILDX_MULTI_PLATFORM_BUILD ?= false
1313
BUILDX_BUILDER_NAME ?= gtbuilder
1414
BASE_IMAGE ?= ubuntu

rust-toolchain.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
[toolchain]
2-
channel = "nightly-2024-06-06"
3-
2+
channel = "nightly-2024-10-19"

src/auth/src/user_provider/static_user_provider.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl StaticUserProvider {
3333
value: value.to_string(),
3434
msg: "StaticUserProviderOption must be in format `<option>:<value>`",
3535
})?;
36-
return match mode {
36+
match mode {
3737
"file" => {
3838
let users = load_credential_from_file(content)?
3939
.context(InvalidConfigSnafu {
@@ -58,7 +58,7 @@ impl StaticUserProvider {
5858
msg: "StaticUserProviderOption must be in format `file:<path>` or `cmd:<values>`",
5959
}
6060
.fail(),
61-
};
61+
}
6262
}
6363
}
6464

src/catalog/src/system_schema/information_schema/table_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
/// All table names in `information_schema`.
15+
//! All table names in `information_schema`.
1616
1717
pub const TABLES: &str = "tables";
1818
pub const COLUMNS: &str = "columns";

src/catalog/src/system_schema/pg_catalog/pg_namespace.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
//! The `pg_catalog.pg_namespace` table implementation.
16+
//! namespace is a schema in greptime
17+
1518
pub(super) mod oid_map;
1619

1720
use std::sync::{Arc, Weak};
@@ -40,9 +43,6 @@ use crate::system_schema::utils::tables::{string_column, u32_column};
4043
use crate::system_schema::SystemTable;
4144
use crate::CatalogManager;
4245

43-
/// The `pg_catalog.pg_namespace` table implementation.
44-
/// namespace is a schema in greptime
45-
4646
const NSPNAME: &str = "nspname";
4747
const INIT_CAPACITY: usize = 42;
4848

src/cmd/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ pub trait App: Send {
8484
}
8585

8686
/// Log the versions of the application, and the arguments passed to the cli.
87+
///
8788
/// `version` should be the same as the output of cli "--version";
8889
/// and the `short_version` is the short version of the codes, often consist of git branch and commit.
8990
pub fn log_versions(version: &str, short_version: &str, app: &str) {

src/common/base/src/secrets.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ impl From<String> for SecretString {
4646
}
4747
}
4848

49-
/// Wrapper type for values that contains secrets, which attempts to limit
50-
/// accidental exposure and ensure secrets are wiped from memory when dropped.
49+
/// Wrapper type for values that contains secrets.
50+
///
51+
/// It attempts to limit accidental exposure and ensure secrets are wiped from memory when dropped.
5152
/// (e.g. passwords, cryptographic keys, access tokens or other credentials)
5253
///
5354
/// Access to the secret inner value occurs through the [`ExposeSecret`]

src/common/catalog/src/consts.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,15 @@ pub const INFORMATION_SCHEMA_PROCEDURE_INFO_TABLE_ID: u32 = 34;
103103
/// id for information_schema.region_statistics
104104
pub const INFORMATION_SCHEMA_REGION_STATISTICS_TABLE_ID: u32 = 35;
105105

106-
/// ----- End of information_schema tables -----
106+
// ----- End of information_schema tables -----
107107

108108
/// ----- Begin of pg_catalog tables -----
109109
pub const PG_CATALOG_PG_CLASS_TABLE_ID: u32 = 256;
110110
pub const PG_CATALOG_PG_TYPE_TABLE_ID: u32 = 257;
111111
pub const PG_CATALOG_PG_NAMESPACE_TABLE_ID: u32 = 258;
112112

113-
/// ----- End of pg_catalog tables -----
113+
// ----- End of pg_catalog tables -----
114+
114115
pub const MITO_ENGINE: &str = "mito";
115116
pub const MITO2_ENGINE: &str = "mito2";
116117
pub const METRIC_ENGINE: &str = "metric";

0 commit comments

Comments
 (0)