Skip to content

Commit

Permalink
chore: switch to nightly-2024-05-15 and
Browse files Browse the repository at this point in the history
Update cargo-component to 0.14.0
  • Loading branch information
greenhat committed Jul 30, 2024
1 parent ba3e71b commit 4149074
Show file tree
Hide file tree
Showing 40 changed files with 7,578 additions and 7,236 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- '*.md'

env:
CARGO_MAKE_TOOLCHAIN: nightly-2024-03-10
CARGO_MAKE_TOOLCHAIN: nightly-2024-05-15

jobs:
compiler:
Expand Down
88 changes: 46 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ args = ["component", "add", "rust-src"]
category = "Test"
description = "Install cargo-component extension"
command = "cargo"
args = ["install", "cargo-component@0.7.0"]
args = ["install", "cargo-component@0.14.0"]

[tasks.install-cargo-tarpaulin]
category = "Test"
Expand Down
5 changes: 5 additions & 0 deletions codegen/masm/src/codegen/scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,10 @@ pub struct BlockInfo {
/// The id of the last instruction in the source HIR block,
/// this is commonly used to check for liveness after the end
/// of a block
#[allow(dead_code)]
pub last_inst: hir::Inst,
/// The innermost loop to which this block belongs
#[allow(dead_code)]
pub innermost_loop: Option<Loop>,
/// If set, indicates that this block is the loop header
/// for the specified loop.
Expand Down Expand Up @@ -213,8 +215,10 @@ impl Schedule {
#[derive(Debug, Clone)]
pub enum ScheduleOp {
/// Always the first instruction in a schedule, represents entry into a function
#[allow(dead_code)]
Init(hir::Block),
/// Push the current block context on the context stack, and switch to the given block context
#[allow(dead_code)]
Enter(hir::Block),
/// Pop the most recent block context from the context stack and switch to it
Exit,
Expand All @@ -233,6 +237,7 @@ pub enum Plan {
/// This represents entering a block, so all further instructions
/// are scheduled in the context of the given block until an ExitBlock
/// meta-instruction is encountered.
#[allow(dead_code)]
Start(hir::Block),
/// Schedule execution of an instruction's pre-requisites
PreInst(Rc<InstInfo>),
Expand Down
8 changes: 8 additions & 0 deletions frontend-wasm/src/component/info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ pub struct LinearComponentTranslation {
///
/// NB: Lots of the component model is not yet implemented in the runtime so
/// this is going to undergo a lot of churn.
#[allow(dead_code)]
#[derive(Default, Debug)]
pub struct LinearComponent {
/// A list of typed values that this component imports.
Expand Down Expand Up @@ -213,6 +214,7 @@ pub enum GlobalInitializer {
/// Declares a new defined resource within this component.
///
/// Contains information about the destructor, for example.
#[allow(dead_code)]
Resource(Resource),
}

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

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

Expand Down Expand Up @@ -344,6 +348,7 @@ pub enum ExportItem<T> {
}

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

/// Canonical ABI options associated with a lifted or lowered function.
#[allow(dead_code)]
#[derive(Debug, Clone)]
pub struct CanonicalOptions {
/// The component instance that this bundle was associated with.
Expand Down Expand Up @@ -402,6 +408,7 @@ pub enum StringEncoding {
///
/// This will have the effect of initializing runtime state for this resource,
/// namely the destructor is fetched and stored.
#[allow(dead_code)]
#[derive(Debug)]
pub struct Resource {
/// The local index of the resource being defined.
Expand All @@ -419,6 +426,7 @@ pub struct Resource {
///
/// All trampolines have a core wasm function signature associated with them
/// which is stored in the `Component::trampolines` array.
#[allow(dead_code)]
#[derive(Debug)]
pub enum Trampoline {
/// Description of a lowered import used in conjunction with
Expand Down
Loading

0 comments on commit 4149074

Please sign in to comment.