Skip to content

Commit 447e753

Browse files
author
Mira Ressel
authored
ci: bump ci image to rust 1.73.0 (#1830)
Co-authored-by: command-bot <>
1 parent 1d9ec57 commit 447e753

File tree

28 files changed

+156
-129
lines changed

28 files changed

+156
-129
lines changed

.cargo/config.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
#
1+
[build]
2+
rustdocflags = [
3+
"-Dwarnings",
4+
"-Arustdoc::redundant_explicit_links", # stylistic
5+
]
6+
27
# An auto defined `clippy` feature was introduced,
38
# but it was found to clash with user defined features,
49
# so was renamed to `cargo-clippy`.
@@ -30,4 +35,5 @@ rustflags = [
3035
"-Aclippy::derivable_impls", # false positives
3136
"-Aclippy::stable_sort_primitive", # prefer stable sort
3237
"-Aclippy::extra-unused-type-parameters", # stylistic
38+
"-Aclippy::default_constructed_unit_structs", # stylistic
3339
]

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ workflow:
2121
- if: $CI_COMMIT_BRANCH
2222

2323
variables:
24-
CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
24+
CI_IMAGE: !reference [.ci-unified-1.73.0, variables, CI_IMAGE]
2525
# BUILDAH_IMAGE is defined in group variables
2626
BUILDAH_COMMAND: "buildah --storage-driver overlay2"
2727
RELENG_SCRIPTS_BRANCH: "master"

.gitlab/pipeline/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ build-rustdoc:
9191
- .run-immediately
9292
variables:
9393
SKIP_WASM_BUILD: 1
94+
RUSTDOCFLAGS: ""
9495
artifacts:
9596
name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}-doc"
9697
when: on_success
@@ -99,7 +100,6 @@ build-rustdoc:
99100
- ./crate-docs/
100101
script:
101102
# FIXME: it fails with `RUSTDOCFLAGS="-Dwarnings"` and `--all-features`
102-
# FIXME: return to stable when https://github.com/rust-lang/rust/issues/96937 gets into stable
103103
- time cargo doc --features try-runtime,experimental --workspace --no-deps
104104
- rm -f ./target/doc/.lock
105105
- mv ./target/doc ./crate-docs

.gitlab/pipeline/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ test-rustdoc:
181181
- .run-immediately
182182
variables:
183183
SKIP_WASM_BUILD: 1
184-
RUSTDOCFLAGS: "-Dwarnings"
185184
script:
186185
- time cargo doc --workspace --all-features --no-deps
187186
allow_failure: true

polkadot/node/core/backing/src/tests/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,8 +1595,8 @@ fn retry_works() {
15951595
},
15961596
AllMessages::RuntimeApi(RuntimeApiMessage::Request(
15971597
_,
1598-
RuntimeApiRequest::SessionExecutorParams(sess_idx, tx),
1599-
)) if sess_idx == 1 => {
1598+
RuntimeApiRequest::SessionExecutorParams(1, tx),
1599+
)) => {
16001600
tx.send(Ok(Some(ExecutorParams::default()))).unwrap();
16011601
},
16021602
msg => {

polkadot/node/overseer/examples/minimal-example.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ fn main() {
163163
.unwrap();
164164

165165
let overseer_fut = overseer.run().fuse();
166-
let timer_stream = timer_stream;
167166

168167
pin_mut!(timer_stream);
169168
pin_mut!(overseer_fut);

substrate/client/cli/src/commands/inspect_node_key.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ mod tests {
8585
fn inspect_node_key() {
8686
let path = tempfile::tempdir().unwrap().into_path().join("node-id").into_os_string();
8787
let path = path.to_str().unwrap();
88-
let cmd = GenerateNodeKeyCmd::parse_from(&["generate-node-key", "--file", path.clone()]);
88+
let cmd = GenerateNodeKeyCmd::parse_from(&["generate-node-key", "--file", path]);
8989

9090
assert!(cmd.run().is_ok());
9191

substrate/client/network/common/src/role.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@
1616
// You should have received a copy of the GNU General Public License
1717
// along with this program. If not, see <https://www.gnu.org/licenses/>.
1818

19+
// file-level lint whitelist to avoid problem with bitflags macro below
20+
// TODO: can be dropped after an update to bitflags 2.4
21+
#![allow(clippy::bad_bit_mask)]
22+
1923
use codec::{self, Encode, EncodeLike, Input, Output};
2024

2125
/// Role that the peer sent to us during the handshake, with the addition of what our local node

substrate/client/network/src/protocol/notifications/behaviour.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1423,7 +1423,6 @@ impl NetworkBehaviour for Notifications {
14231423
let delay_id = self.next_delay_id;
14241424
self.next_delay_id.0 += 1;
14251425
let delay = futures_timer::Delay::new(ban_duration);
1426-
let peer_id = peer_id;
14271426
self.delays.push(
14281427
async move {
14291428
delay.await;

substrate/frame/contracts/src/wasm/prepare.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ impl LoadedModule {
7979
}
8080

8181
let engine = Engine::new(&config);
82-
let module =
83-
Module::new(&engine, code.clone()).map_err(|_| "Can't load the module into wasmi!")?;
82+
let module = Module::new(&engine, code).map_err(|_| "Can't load the module into wasmi!")?;
8483

8584
// Return a `LoadedModule` instance with
8685
// __valid__ module.

0 commit comments

Comments
 (0)