Skip to content
This repository was archived by the owner on Oct 25, 2021. It is now read-only.

Commit 3c926b3

Browse files
committed
finish up initial release of docs/book
- remove all submodules - clean up travis. Appveyor still broken.
1 parent 071f25a commit 3c926b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5043
-441
lines changed

.gitmodules

Lines changed: 0 additions & 12 deletions
This file was deleted.

.travis.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@
33

44
language: rust
55
rust:
6-
- stable
6+
# TODO: pin specific nightly
7+
- nightly
78

89
cache: cargo
910

11+
before_install:
12+
- set -e
13+
14+
install:
15+
# - cargo install cargo-web || echo "cargo-web already installed"
16+
- sh ci/install2.sh
17+
- cargo install mdbook || echo "mdbook already installed"
18+
1019
notifications:
1120
email:
1221
on_success: never

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ jsonrpc-core = "8.0.1"
3838
artifact_data = {path = "artifact-data"}
3939
artifact_lib = {path = "artifact-lib"}
4040
jrpc = "0.4.0"
41+
quicli = "0.3.0"
4142

42-
[dependencies.quicli]
43-
path = "quicli"
44-
default-features = false
43+
# [dependencies.quicli]
44+
# path = "quicli"
45+
# default-features = false
4546

4647
[dev-dependencies]
4748
assert_cli = "0.6.1"

appveyor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ environment:
55
global:
66
# This is the Rust channel that build jobs will use by default but can be
77
# overridden on a case by case basis down below
8-
RUST_VERSION: stable
8+
RUST_VERSION: nightly
99
#RUST_VERSION: nightly-2017-08-31
1010

1111
CRATE_NAME: artifact-app
@@ -42,15 +42,16 @@ install:
4242
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
4343
- rustc -Vv
4444
- cargo -V
45+
- cargo install cargo-web
46+
- cargo install mdbook
4547

4648
# TODO This is the "test phase", tweak it as you see fit
4749
test_script:
4850
# we don't run the "test phase" when doing deploys
4951
- if [%APPVEYOR_REPO_TAG%]==[false] (
50-
cargo rustc --target %TARGET% --release --bin art -- -C lto &&
5152
cargo test --target %TARGET% &&
5253
cargo run --target %TARGET% -- check &&
53-
cargo test --target %TARGET% --release
54+
cargo rustc --target %TARGET% --release --bin art -- -C lto
5455
)
5556

5657
# before_deploy:

artifact-frontend/Cargo.lock

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

artifact-frontend/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ stdweb = "0.4.6"
99
artifact_ser = {path="../artifact-ser"}
1010
ergo_std = "0.0.3"
1111
ergo_config = "0.0.1"
12-
yew_simple = { path = "yew_simple" }
12+
yew_simple = "0.3.0"
1313
expect_macro = "0.2.1"
1414
jrpc = "0.4.0"
1515
http = "0.1.6"
1616

1717
[dev-dependencies]
18-
19-
[replace]
20-
"stdweb:0.4.4" = { path = 'stdweb' }
21-
"yew:0.3.0" = { path = 'yew' }

artifact-frontend/src/view.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,17 @@ fn replace_markdown<'a, 't>(model: &Model, parent: &'a str, markdown: &'t str) -
100100

101101
/// Replace the markdown for a subname declaraction.
102102
fn replace_markdown_sub(model: &Model, parent: &str, sub: &str) -> String {
103-
// TODO: also format the link/location
104-
let color = match model.shared.get_impl(parent, Some(sub)) {
105-
Ok(_) => BLUE,
106-
Err(_) => RED,
103+
let impl_ = model.shared.get_impl(parent, Some(sub));
104+
let (title, color) = match impl_ {
105+
Ok(i) => (format!("{:?}", i), BLUE),
106+
Err(_) => ("Not Implemented".to_string(), RED),
107107
};
108+
108109
format!(
109-
"<span title=\"subname\" style=\"font-weight: bold; color: {}\">\
110+
"<span title=\"{}\" style=\"font-weight: bold; color: {}\">\
110111
{}\
111112
</span>",
112-
color, sub,
113+
title, color, sub,
113114
)
114115
}
115116

artifact-frontend/stdweb

Lines changed: 0 additions & 1 deletion
This file was deleted.

artifact-frontend/yew

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)