Skip to content

Commit

Permalink
chore(toolchain): update rust-toolchain to 2023-05-03 (#1524)
Browse files Browse the repository at this point in the history
* chore(toolchain): update rust-toolchain to 2023-05-03

Signed-off-by: Ruihang Xia <[email protected]>

* update workflow yaml

Signed-off-by: Ruihang Xia <[email protected]>

---------

Signed-off-by: Ruihang Xia <[email protected]>
  • Loading branch information
waynexia authored May 6, 2023
1 parent 6fe117d commit d4f3f61
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ rustflags = [
"-Wclippy::print_stdout",
"-Wclippy::print_stderr",
"-Wclippy::implicit_clone",
"-Aclippy::items_after_test_module",
]
2 changes: 1 addition & 1 deletion .github/workflows/apidoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
name: Build API docs

env:
RUST_TOOLCHAIN: nightly-2023-02-26
RUST_TOOLCHAIN: nightly-2023-05-03

jobs:
apidoc:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
name: CI

env:
RUST_TOOLCHAIN: nightly-2023-02-26
RUST_TOOLCHAIN: nightly-2023-05-03

jobs:
typos:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
name: Release

env:
RUST_TOOLCHAIN: nightly-2023-02-26
RUST_TOOLCHAIN: nightly-2023-05-03

SCHEDULED_BUILD_VERSION_PREFIX: v0.3.0

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2023-02-26"
channel = "nightly-2023-05-03"
3 changes: 1 addition & 2 deletions src/common/recordbatch/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ pub async fn collect_batches(stream: SendableRecordBatchStream) -> Result<Record

#[cfg(test)]
mod tests {
use std::mem;
use std::pin::Pin;
use std::sync::Arc;

Expand Down Expand Up @@ -59,7 +58,7 @@ mod tests {
type Item = Result<RecordBatch>;

fn poll_next(mut self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let batch = mem::replace(&mut self.batch, None);
let batch = self.batch.take();

if let Some(batch) = batch {
Poll::Ready(Some(Ok(batch)))
Expand Down
2 changes: 1 addition & 1 deletion src/servers/src/auth/user_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl TryFrom<&str> for StaticUserProvider {
let file = File::open(path).context(IoSnafu)?;
let credential = io::BufReader::new(file)
.lines()
.filter_map(|line| line.ok())
.map_while(std::result::Result::ok)
.filter_map(|line| {
if let Some((k, v)) = line.split_once('=') {
Some((k.to_string(), v.as_bytes().to_vec()))
Expand Down
2 changes: 1 addition & 1 deletion src/store-api/src/manifest/action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

///! Common actions for manifest
//! Common actions for manifest
use serde::{Deserialize, Serialize};

use crate::manifest::ManifestVersion;
Expand Down
1 change: 1 addition & 0 deletions src/table-procedure/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ use table::engine::{TableEngineProcedureRef, TableEngineRef};
///
/// # Panics
/// Panics on error.
#[allow(clippy::items_after_test_module)]
pub fn register_procedure_loaders(
catalog_manager: CatalogManagerRef,
engine_procedure: TableEngineProcedureRef,
Expand Down

0 comments on commit d4f3f61

Please sign in to comment.