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.

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

gather crates into workspace #285

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -47,18 +47,22 @@ jobs:
Xvfb :99 &
sleep 3
openbox &
cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture
cargo test -- --nocapture
- name: "relm-derive: tests"
run: |
cargo test --manifest-path relm-derive/Cargo.toml -- --nocapture
- name: "relm: test examples"
- name: "relm-examples: tests"
run: |
Xvfb :99 &
sleep 3
openbox &
cargo test --manifest-path relm-examples/Cargo.toml --examples
cargo test --manifest-path relm-examples/Cargo.toml -- --nocapture
- name: "relm-test: tests"
run: |
cargo test --manifest-path relm-test/Cargo.toml -- --nocapture
- name: "relm: test buttons-attribute example"
run: |
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
target
/target
Cargo.lock
release.sh
19 changes: 19 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -21,5 +21,24 @@ gtk = "^0.14.0"
libc = "^0.2.54"
log = "^0.4.6"

[dev-dependencies]
relm-derive = { path = "relm-derive" }

[features]
hidpi = []

[workspace]
members = [
".",
"relm-derive",
"relm-examples",
"relm-examples/examples/7gui/*",
"relm-test",

# The following must be listed manually instead of "relm-examples/examples/*"
# because of rust-lang/cargo#6745.
"relm-examples/examples/async",
"relm-examples/examples/buttons-attribute",
"relm-examples/examples/http",
"relm-examples/examples/webkit-test",
]
2 changes: 1 addition & 1 deletion relm-examples/tests/include.rs
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ impl Widget for Win {
}

// Specify a view written in another file.
view!("tests/buttons.relm");
view!("relm-examples/tests/buttons.relm");
}

fn main() {
4 changes: 4 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -240,9 +240,13 @@ type InitTestComponents<WIDGET> = (Component<WIDGET>, <WIDGET as WidgetTest>::St
/// # impl WidgetTest for Win {
/// # type Widgets = Win;
/// #
/// # type Streams = ();
/// #
/// # fn get_widgets(&self) -> Self::Widgets {
/// # self.clone()
/// # }
/// #
/// # fn get_streams(&self) -> Self::Streams {}
/// # }
/// #
/// # impl Widget for Win {