Skip to content

Commit 2e9c047

Browse files
authored
Merge pull request #33311 from def-/pr-doc-deploy
Fix cargo docs following new nightly version
2 parents cd00f92 + 3d9ba93 commit 2e9c047

File tree

15 files changed

+17
-66
lines changed

15 files changed

+17
-66
lines changed

ci/plugins/cloudtest/hooks/command

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ cleanup() {
162162
mapfile -t artifacts < <(printf "run.log\nkubectl-get-logs.log\nkubectl-get-logs-previous.log\nkubectl-get-events.log\nkubectl-get-all.log\nkubectl-describe-all.log\nkubectl-pods-with-nodes.log\nkubectl-get-events-kube-system.log\nkubectl-get-all-kube-system.log\nkubectl-describe-all-kube-system.log\njournalctl-merge.log\nkail-output.log\n"; find . -name 'junit_*.xml')
163163

164164
{
165-
bin/ci-builder run stable trufflehog --no-update --no-verification --json --exclude-detectors=coda,dockerhub,box,npmtoken,github,snykkey,eightxeight,sumologickey,miro,fmfw,logzio,qase,cannyio filesystem "${artifacts[@]}" | trufflehog_jq_filter_logs > trufflehog.log
165+
bin/ci-builder run stable trufflehog --no-update --no-verification --json --exclude-detectors=coda,dockerhub,box,npmtoken,github,snykkey,eightxeight,sumologickey,miro,fmfw,logzio,qase,cannyio,uplead filesystem "${artifacts[@]}" | trufflehog_jq_filter_logs > trufflehog.log
166166
} &
167167
artifacts_str=$(IFS=";"; echo "${artifacts[*]}")
168168

ci/plugins/mzcompose/hooks/command

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ cleanup() {
176176

177177
echo "--- Running trufflehog to scan artifacts for secrets & uploading artifacts"
178178
{
179-
bin/ci-builder run "$builder" trufflehog --no-update --no-verification --json --exclude-detectors=coda,dockerhub,box,npmtoken,github,snykkey,eightxeight,sumologickey,miro,fmfw,logzio,qase,cannyio filesystem "${artifacts[@]}" | trufflehog_jq_filter_logs > trufflehog.log
179+
bin/ci-builder run "$builder" trufflehog --no-update --no-verification --json --exclude-detectors=coda,dockerhub,box,npmtoken,github,snykkey,eightxeight,sumologickey,miro,fmfw,logzio,qase,cannyio,uplead filesystem "${artifacts[@]}" | trufflehog_jq_filter_logs > trufflehog.log
180180
} &
181181

182182
unset CI_EXTRA_ARGS # We don't want extra args for the annotation

src/adapter/src/session.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ where
8989
/// Invariant: role_metadata must be `Some` after the user has
9090
/// successfully connected to and authenticated with Materialize.
9191
///
92-
/// Prefer using this value over [`Self.user.name`].
92+
/// Prefer using this value over [`SessionConfig::user`].
9393
//
9494
// It would be better for this not to be an Option, but the
9595
// `Session` is initialized before the user has connected to

src/build-tools/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//!
1212
//! For example, many crates have a build script that depends on the Protobuf
1313
//! compiler, `protoc`. If we're building with Cargo we'll bootstrap `protoc`
14-
//! by compiling it with [`protobuf-src`], but if we're building with Bazel
14+
//! by compiling it with `protobuf-src`, but if we're building with Bazel
1515
//! then we'll use the version of `protoc` included in the runfiles.
1616
1717
use cfg_if::cfg_if;

src/cloud-api/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
//!
5151
//! ## Note
5252
//!
53-
//! This crate is implemented following a similar pattern to [`mz-frontegg-client`], [rust-orb-billing] and [rust-frontegg].
53+
//! This crate is implemented following a similar pattern to `mz-frontegg-client`, [rust-orb-billing] and [rust-frontegg].
5454
//!
5555
//! [mz-frontegg-client]:
5656
//! [rust-orb-billing]: <https://github.com/MaterializeInc/rust-orb-billing>

src/controller/src/lib.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pub struct Controller<T: ComputeControllerTimestamp = mz_repr::Timestamp> {
183183
/// A map associating a global ID to the set of all the unfulfilled watch
184184
/// set ids that include it.
185185
///
186-
/// See [`self.install_watch_set`] for a description of watch sets.
186+
/// See [`Controller::install_compute_watch_set`]/[`Controller::install_storage_watch_set`] for a description of watch sets.
187187
// When a watch set is fulfilled for a given object (that is, when
188188
// the object's frontier advances to at least the watch set's
189189
// timestamp), the corresponding entry will be removed from the set.
@@ -195,9 +195,9 @@ pub struct Controller<T: ComputeControllerTimestamp = mz_repr::Timestamp> {
195195

196196
/// A list of watch sets that were already fulfilled as soon as
197197
/// they were installed, and thus that must be returned to the
198-
/// client on the next call to [`self.process`].
198+
/// client on the next call to [`Controller::process_compute_response`]/[`Controller::process_storage_response`].
199199
///
200-
/// See [`self.install_watch_set`] for a description of watch sets.
200+
/// See [`Controller::install_compute_watch_set`]/[`Controller::install_storage_watch_set`] for a description of watch sets.
201201
immediate_watch_sets: Vec<WatchSetId>,
202202

203203
/// Dynamic system configuration.

src/frontegg-client/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//!
1919
//! It contains three variants:
2020
//! * [`Error::Auth`]: represents an authentication error from the
21-
//! [`mz-frontegg-auth`] crate.
21+
//! `mz-frontegg-auth` crate.
2222
//! * [`Error::Transport`]: represents a transport error from the `reqwest`
2323
//! crate during a network request.
2424
//! * [`Error::Api`]: represents an Frontegg API error from a request.

src/interchange/src/avro/decode.rs

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77
// the Business Source License, use of this software will be governed
88
// by the Apache License, Version 2.0.
99

10-
use std::cell::RefCell;
1110
use std::collections::BTreeMap;
12-
use std::rc::Rc;
1311

1412
use anyhow::{Context, Error};
1513
use mz_avro::error::{DecodeError, Error as AvroError};
1614
use mz_avro::{
1715
AvroArrayAccess, AvroDecode, AvroDeserializer, AvroMapAccess, AvroRead, AvroRecordAccess,
18-
GeneralDeserializer, StatefulAvroDecodable, ValueDecoder, ValueOrReader, define_unexpected,
19-
give_value,
16+
GeneralDeserializer, ValueDecoder, ValueOrReader, give_value,
2017
};
2118
use mz_ore::error::ErrorExt;
2219
use mz_repr::adt::date::Date;
@@ -133,47 +130,6 @@ impl Decoder {
133130
}
134131
}
135132

136-
pub(super) struct RowDecoder {
137-
state: (Rc<RefCell<Row>>, Rc<RefCell<Vec<u8>>>),
138-
}
139-
140-
impl AvroDecode for RowDecoder {
141-
type Out = RowWrapper;
142-
fn record<R: AvroRead, A: AvroRecordAccess<R>>(
143-
self,
144-
a: &mut A,
145-
) -> Result<Self::Out, AvroError> {
146-
let mut row_borrow = self.state.0.borrow_mut();
147-
let mut buf_borrow = self.state.1.borrow_mut();
148-
let mut packer = row_borrow.packer();
149-
let inner = AvroFlatDecoder {
150-
packer: &mut packer,
151-
buf: &mut buf_borrow,
152-
is_top: true,
153-
};
154-
inner.record(a)?;
155-
Ok(RowWrapper(row_borrow.clone()))
156-
}
157-
define_unexpected! {
158-
union_branch, array, map, enum_variant, scalar, decimal, bytes, string, json, uuid, fixed
159-
}
160-
}
161-
162-
// Get around orphan rule
163-
#[derive(Debug)]
164-
pub(super) struct RowWrapper(#[allow(dead_code)] pub Row);
165-
166-
impl StatefulAvroDecodable for RowWrapper {
167-
type Decoder = RowDecoder;
168-
// TODO - can we make this some sort of &'a mut (Row, Vec<u8>) without
169-
// running into lifetime crap?
170-
type State = (Rc<RefCell<Row>>, Rc<RefCell<Vec<u8>>>);
171-
172-
fn new_decoder(state: Self::State) -> Self::Decoder {
173-
Self::Decoder { state }
174-
}
175-
}
176-
177133
#[derive(Debug)]
178134
pub struct AvroFlatDecoder<'a, 'row> {
179135
pub packer: &'a mut RowPacker<'row>,

src/ore/src/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ macro_rules! cast_from {
6060
}
6161
}
6262

63-
/// Casts [`$from`] to [`$to`].
63+
/// Casts `from` to `to`.
6464
///
6565
/// This is equivalent to the [`crate::cast::CastFrom`] implementation but is
6666
/// available as a `const fn`.

src/sql-parser/src/ast/defs/name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ impl Ident {
275275
}
276276

277277
/// An identifier can be printed in bare mode if
278-
/// * it matches the regex [a-z_][a-z0-9_]* and
278+
/// * it matches the regex `[a-z_][a-z0-9_]*` and
279279
/// * it is not a "reserved keyword."
280280
pub fn can_be_printed_bare(&self) -> bool {
281281
let mut chars = self.0.chars();

0 commit comments

Comments
 (0)