Skip to content

Commit 4149074

Browse files
committed
chore: switch to nightly-2024-05-15 and
Update cargo-component to 0.14.0
1 parent ba3e71b commit 4149074

40 files changed

+7578
-7236
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
- '*.md'
1212

1313
env:
14-
CARGO_MAKE_TOOLCHAIN: nightly-2024-03-10
14+
CARGO_MAKE_TOOLCHAIN: nightly-2024-05-15
1515

1616
jobs:
1717
compiler:

Cargo.lock

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

Makefile.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ args = ["component", "add", "rust-src"]
212212
category = "Test"
213213
description = "Install cargo-component extension"
214214
command = "cargo"
215-
args = ["install", "cargo-component@0.7.0"]
215+
args = ["install", "cargo-component@0.14.0"]
216216

217217
[tasks.install-cargo-tarpaulin]
218218
category = "Test"

codegen/masm/src/codegen/scheduler.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,10 @@ pub struct BlockInfo {
149149
/// The id of the last instruction in the source HIR block,
150150
/// this is commonly used to check for liveness after the end
151151
/// of a block
152+
#[allow(dead_code)]
152153
pub last_inst: hir::Inst,
153154
/// The innermost loop to which this block belongs
155+
#[allow(dead_code)]
154156
pub innermost_loop: Option<Loop>,
155157
/// If set, indicates that this block is the loop header
156158
/// for the specified loop.
@@ -213,8 +215,10 @@ impl Schedule {
213215
#[derive(Debug, Clone)]
214216
pub enum ScheduleOp {
215217
/// Always the first instruction in a schedule, represents entry into a function
218+
#[allow(dead_code)]
216219
Init(hir::Block),
217220
/// Push the current block context on the context stack, and switch to the given block context
221+
#[allow(dead_code)]
218222
Enter(hir::Block),
219223
/// Pop the most recent block context from the context stack and switch to it
220224
Exit,
@@ -233,6 +237,7 @@ pub enum Plan {
233237
/// This represents entering a block, so all further instructions
234238
/// are scheduled in the context of the given block until an ExitBlock
235239
/// meta-instruction is encountered.
240+
#[allow(dead_code)]
236241
Start(hir::Block),
237242
/// Schedule execution of an instruction's pre-requisites
238243
PreInst(Rc<InstInfo>),

frontend-wasm/src/component/info.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ pub struct LinearComponentTranslation {
6060
///
6161
/// NB: Lots of the component model is not yet implemented in the runtime so
6262
/// this is going to undergo a lot of churn.
63+
#[allow(dead_code)]
6364
#[derive(Default, Debug)]
6465
pub struct LinearComponent {
6566
/// A list of typed values that this component imports.
@@ -213,6 +214,7 @@ pub enum GlobalInitializer {
213214
/// Declares a new defined resource within this component.
214215
///
215216
/// Contains information about the destructor, for example.
217+
#[allow(dead_code)]
216218
Resource(Resource),
217219
}
218220

@@ -223,6 +225,7 @@ pub struct ExtractMemory {
223225
/// The index of the memory being defined.
224226
pub index: RuntimeMemoryIndex,
225227
/// Where this memory is being extracted from.
228+
#[allow(dead_code)]
226229
pub export: CoreExport<MemoryIndex>,
227230
}
228231

@@ -260,6 +263,7 @@ pub enum InstantiateModule {
260263
/// This is similar to `Upvar` but notably the imports are provided as a
261264
/// two-level named map since import resolution order needs to happen at
262265
/// runtime.
266+
#[allow(dead_code)]
263267
Import(RuntimeImportIndex, IndexMap<String, IndexMap<String, CoreDef>>),
264268
}
265269

@@ -344,6 +348,7 @@ pub enum ExportItem<T> {
344348
}
345349

346350
/// Possible exports from a component.
351+
#[allow(dead_code)]
347352
#[derive(Debug, Clone)]
348353
pub enum Export {
349354
/// A lifted function being exported which is an adaptation of a core wasm
@@ -369,6 +374,7 @@ pub enum Export {
369374
}
370375

371376
/// Canonical ABI options associated with a lifted or lowered function.
377+
#[allow(dead_code)]
372378
#[derive(Debug, Clone)]
373379
pub struct CanonicalOptions {
374380
/// The component instance that this bundle was associated with.
@@ -402,6 +408,7 @@ pub enum StringEncoding {
402408
///
403409
/// This will have the effect of initializing runtime state for this resource,
404410
/// namely the destructor is fetched and stored.
411+
#[allow(dead_code)]
405412
#[derive(Debug)]
406413
pub struct Resource {
407414
/// The local index of the resource being defined.
@@ -419,6 +426,7 @@ pub struct Resource {
419426
///
420427
/// All trampolines have a core wasm function signature associated with them
421428
/// which is stored in the `Component::trampolines` array.
429+
#[allow(dead_code)]
422430
#[derive(Debug)]
423431
pub enum Trampoline {
424432
/// Description of a lowered import used in conjunction with

0 commit comments

Comments
 (0)