Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

doc/rename-complex-example-to-resources #279

Merged
merged 1 commit into from
Aug 26, 2024
Merged

doc/rename-complex-example-to-resources #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ updates:
interval: "daily"

- package-ecosystem: gomod
directory: /examples/go/complex-server
directory: /examples/go/resources-server
schedule:
interval: daily

Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions examples/go/complex-server/complex_server.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion examples/go/complex-server/wit/deps.toml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions examples/go/complex-server/wit/world.wit
View file
Open in desktop

This file was deleted.

100 changes: 50 additions & 50 deletions ...amples/complex/resources/bindings.wrpc.go → ...ples/resources/resources/bindings.wrpc.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ...go/complex-server/bindings/server.wrpc.go → .../resources-server/bindings/server.wrpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
package server

import (
exports__wrpc_examples__complex__resources "wrpc.io/examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources"
exports__wrpc_examples__resources__resources "wrpc.io/examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources"
wrpc "wrpc.io/go"
)

func Serve(s wrpc.Server, h0 exports__wrpc_examples__complex__resources.Handler) (stop func() error, err error) {
func Serve(s wrpc.Server, h0 exports__wrpc_examples__resources__resources.Handler) (stop func() error, err error) {
stops := make([]func() error, 0, 1)
stop = func() error {
for _, stop := range stops {
Expand All @@ -17,7 +17,7 @@ func Serve(s wrpc.Server, h0 exports__wrpc_examples__complex__resources.Handler)
}
return nil
}
stop0, err := exports__wrpc_examples__complex__resources.ServeInterface(s, h0)
stop0, err := exports__wrpc_examples__resources__resources.ServeInterface(s, h0)
if err != nil {
return
}
Expand Down
4 changes: 2 additions & 2 deletions ...ex-server/cmd/complex-server-nats/main.go → ...-server/cmd/resources-server-nats/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"sync"
"syscall"

server "wrpc.io/examples/go/complex-server/bindings"
"wrpc.io/examples/go/complex-server/bindings/exports/wrpc_examples/complex/resources"
server "wrpc.io/examples/go/resources-server/bindings"
"wrpc.io/examples/go/resources-server/bindings/exports/wrpc_examples/resources/resources"
wrpc "wrpc.io/go"
wrpcnats "wrpc.io/go/nats"
"github.com/google/uuid"
Expand Down
2 changes: 1 addition & 1 deletion examples/go/complex-server/go.mod → examples/go/resources-server/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module wrpc.io/examples/go/complex-server
module wrpc.io/examples/go/resources-server

go 1.22.2

Expand Down
0 examples/go/complex-server/go.sum → examples/go/resources-server/go.sum
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions examples/go/resources-server/resources_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//go:generate cargo run --bin wit-bindgen-wrpc go --out-dir bindings --package wrpc.io/examples/go/resources/bindings wit

package resources_server
4 changes: 2 additions & 2 deletions ...st/complex-component-client/wit/deps.lock → examples/go/resources-server/wit/deps.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[complex]
path = "../../../wit/complex"
[resources]
path = "../../../wit/resources"
sha256 = "d47aff89928fe5bb30ddc79a4bae79a5af6fa075e8694953567544fefa507048"
sha512 = "2de2d6fccb3bde7f9c163890993b53191cc399fb16e28742dbd25f449fc1d8a2e0766a101d0cf4c252be07e2aa3c892daba876b009a0bd33e3c5dd5f74f790da"
1 change: 1 addition & 0 deletions examples/go/resources-server/wit/deps.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
resources = "../../../wit/resources"
2 changes: 1 addition & 1 deletion ...mplex-server/wit/deps/complex/complex.wit → ...s-server/wit/deps/resources/resources.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wrpc-examples:complex;
package wrpc-examples:resources;

interface resources {
resource foo {
Expand Down
5 changes: 5 additions & 0 deletions examples/go/resources-server/wit/world.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package wrpc-examples:resources-go-server;

world server {
include wrpc-examples:resources/server;
}
1 change: 0 additions & 1 deletion examples/rust/complex-component-client/wit/deps.toml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions examples/rust/complex-component-client/wit/world.wit
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion examples/rust/complex-component-server/wit/deps.toml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions examples/rust/complex-component-server/wit/world.wit
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .../rust/complex-component-client/Cargo.toml → ...ust/resources-component-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "complex-component-client"
name = "resources-component-client"
version = "0.1.0"

authors.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions ...rust/complex-component-client/src/main.rs → ...st/resources-component-client/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use crate::bindings::wrpc_examples::complex::resources;
use crate::bindings::wrpc_examples::resources::resources;

mod bindings {
wit_bindgen::generate!({
with: {
"wrpc-examples:complex/resources": generate
"wrpc-examples:resources/resources": generate
}
});
}
Expand Down
4 changes: 2 additions & 2 deletions ...st/complex-component-server/wit/deps.lock → .../resources-component-client/wit/deps.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[complex]
path = "../../../wit/complex"
[resources]
path = "../../../wit/resources"
sha256 = "d47aff89928fe5bb30ddc79a4bae79a5af6fa075e8694953567544fefa507048"
sha512 = "2de2d6fccb3bde7f9c163890993b53191cc399fb16e28742dbd25f449fc1d8a2e0766a101d0cf4c252be07e2aa3c892daba876b009a0bd33e3c5dd5f74f790da"
1 change: 1 addition & 0 deletions examples/rust/resources-component-client/wit/deps.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
resources = "../../../wit/resources"
2 changes: 1 addition & 1 deletion ...onent-server/wit/deps/complex/complex.wit → ...t-client/wit/deps/resources/resources.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wrpc-examples:complex;
package wrpc-examples:resources;

interface resources {
resource foo {
Expand Down
5 changes: 5 additions & 0 deletions examples/rust/resources-component-client/wit/world.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package wrpc-examples:resources-component-client;

world client {
include wrpc-examples:resources/client;
}
2 changes: 1 addition & 1 deletion .../rust/complex-component-server/Cargo.toml → ...ust/resources-component-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "complex-component-server"
name = "resources-component-server"
version = "0.1.0"

authors.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions .../rust/complex-component-server/src/lib.rs → ...ust/resources-component-server/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ mod bindings {

wit_bindgen::generate!({
with: {
"wrpc-examples:complex/resources": generate
"wrpc-examples:resources/resources": generate
}
});

export!(Handler);
}

use bindings::exports::wrpc_examples::complex::resources::{FooBorrow, GuestFoo};
use bindings::exports::wrpc_examples::resources::resources::{FooBorrow, GuestFoo};

pub struct Handler;

pub struct Foo;

impl bindings::exports::wrpc_examples::complex::resources::GuestFoo for Foo {
impl bindings::exports::wrpc_examples::resources::resources::GuestFoo for Foo {
fn new() -> Self {
Self
}

fn foo(_: bindings::exports::wrpc_examples::complex::resources::Foo) -> String {
fn foo(_: bindings::exports::wrpc_examples::resources::resources::Foo) -> String {
"foo".to_string()
}

Expand All @@ -31,7 +31,7 @@ impl bindings::exports::wrpc_examples::complex::resources::GuestFoo for Foo {
}
}

impl bindings::exports::wrpc_examples::complex::resources::Guest for Handler {
impl bindings::exports::wrpc_examples::resources::resources::Guest for Handler {
type Foo = Foo;

fn bar(v: FooBorrow<'_>) -> String {
Expand Down
4 changes: 2 additions & 2 deletions examples/go/complex-server/wit/deps.lock → .../resources-component-server/wit/deps.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[complex]
path = "../../../wit/complex"
[resources]
path = "../../../wit/resources"
sha256 = "d47aff89928fe5bb30ddc79a4bae79a5af6fa075e8694953567544fefa507048"
sha512 = "2de2d6fccb3bde7f9c163890993b53191cc399fb16e28742dbd25f449fc1d8a2e0766a101d0cf4c252be07e2aa3c892daba876b009a0bd33e3c5dd5f74f790da"
1 change: 1 addition & 0 deletions examples/rust/resources-component-server/wit/deps.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
resources = "../../../wit/resources"
2 changes: 1 addition & 1 deletion examples/wit/complex/complex.wit → ...t-server/wit/deps/resources/resources.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wrpc-examples:complex;
package wrpc-examples:resources;

interface resources {
resource foo {
Expand Down
5 changes: 5 additions & 0 deletions examples/rust/resources-component-server/wit/world.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package wrpc-examples:resources-component-server;

world server {
include wrpc-examples:resources/server;
}
2 changes: 1 addition & 1 deletion ...onent-client/wit/deps/complex/complex.wit → examples/wit/resources/resources.wit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wrpc-examples:complex;
package wrpc-examples:resources;

interface resources {
resource foo {
Expand Down
2 changes: 1 addition & 1 deletion go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
go 1.22.2

use (
./examples/go/complex-server
./examples/go/resources-server
./examples/go/hello-client
./examples/go/hello-server
./examples/go/streams-client
Expand Down
Loading