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

Commit

Permalink
Merge branch 'master' of github.com:vitiral/artifact into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Rett Berg committed Aug 4, 2020
2 parents c453a72 + 1722d37 commit 2b46103
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
> Heads up: reimagining artifact 3.0, check it out at [artifact_py](https://github.com/vitiral/artifact_py)
# Artifact: design documentation for everybody

**Note: this project, and the python re-write, should now be considered
Expand Down Expand Up @@ -67,7 +69,7 @@ In this way, artifact aims to unify other quality best practices while also
make writing design documents more fun and useful in your day to day
development efforts.

**Jump into artifact with the the [youtube commercial][4] and the
**Jump into artifact with the [youtube commercial][4] and the
[Tutorial][1].**

[Also, view artifact's own design docs.][2]
Expand Down
2 changes: 1 addition & 1 deletion artifact-app/src/ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ impl ArtifactExt for Artifact {
extend_names!("Partof", self.partof);
}
if flags.text {
line![t!(self.text.trim_right().to_string())]
line![t!(self.text.trim_end().to_string())]
}

line![t!("\n\n")];
Expand Down
2 changes: 1 addition & 1 deletion artifact-data/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#![allow(dead_code)]
#![allow(unused_imports)]
#![allow(unknown_lints)]
#![allow(doc_markdown)]
#![allow(clippy::doc_markdown)]

#[macro_use]
extern crate expect_macro;
Expand Down
2 changes: 1 addition & 1 deletion artifact-data/src/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ impl Serialize for TextRaw {
S: Serializer,
{
// TODO: error check for invalid markdown lines
let mut trimmed = self.0.trim_right().to_string();
let mut trimmed = self.0.trim_end().to_string();
clean_text(&mut trimmed);
serializer.serialize_str(&trimmed)
}
Expand Down
4 changes: 2 additions & 2 deletions artifact-data/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,10 @@ fn resolve_raw_paths(
.iter()
.filter_map(|p| {
// backwards compatibility: just ignore front `{repo}/`
let p = p.trim_left_matches("{repo}");
let p = p.trim_start_matches("{repo}");
// Also just allow `/something`... Path.join will just IGNORE joining
// something with the other being "/something"
let p = p.trim_left_matches('/');
let p = p.trim_start_matches('/');
let path = expect!(project_path.concat(p));
match PathAbs::new(&path) {
Ok(p) => Some(p),
Expand Down
2 changes: 0 additions & 2 deletions artifact-frontend/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
#![recursion_limit = "256"]
#![allow(unknown_lints)]

use artifact_ser;

#[macro_use]
extern crate expect_macro;
#[macro_use]
Expand Down
2 changes: 1 addition & 1 deletion artifact-frontend/src/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ lazy_static! {
}

/// The function used for routing urls.
#[allow(needless_pass_by_value)]
#[allow(clippy::needless_pass_by_value)]
pub(crate) fn router_fn(info: yew_simple::RouteInfo) -> Msg {
let hash = info.url.fragment().unwrap_or_default();
let view = View::from_hash(hash);
Expand Down
2 changes: 1 addition & 1 deletion artifact-ser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ pub struct ParamsReadProject {

/// Inplace trim is annoyingly not in the stdlib
pub fn string_trim_right(s: &mut String) {
let end = s.trim_right().len();
let end = s.trim_end().len();
s.truncate(end);
}

Expand Down
2 changes: 1 addition & 1 deletion artifact-ser/src/markdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::dev_prelude::*;
use crate::ser::*;
use std::io;

use super::{Completed, SettingsMdDetails, SettingsMdDot, SettingsMdFamily};
use super::{Completed, SettingsMdDot, SettingsMdFamily};
use crate::md_graph;
use crate::name::*;

Expand Down

0 comments on commit 2b46103

Please sign in to comment.