Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitad0fc14

Browse files
committed
Remove old styles
1 parent28ed51b commitad0fc14

File tree

8 files changed

+75
-148
lines changed

8 files changed

+75
-148
lines changed

‎src/display_list/annotation.rs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,8 @@
11
usecrate::annotation::AnnotationType;
2-
use std::fmt;
32

43
#[derive(Debug,Clone)]
54
pubstructAnnotation<'d>{
65
pubannotation_type:AnnotationType,
76
pubid:Option<&'dstr>,
87
publabel:&'dstr,
98
}
10-
11-
impl fmt::DisplayforAnnotationType{
12-
fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
13-
matchself{
14-
Self::None =>Ok(()),
15-
Self::Error => f.write_str("error"),
16-
Self::Warning => f.write_str("warning"),
17-
Self::Info => f.write_str("info"),
18-
Self::Note => f.write_str("note"),
19-
Self::Help => f.write_str("help"),
20-
}
21-
}
22-
}

‎src/display_list/line.rs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
use std::fmt;
2-
use std::fmt::Write;
3-
41
usesuper::annotation::Annotation;
52
usecrate::annotation::AnnotationType;
63

@@ -45,15 +42,6 @@ pub struct DisplayMark {
4542
pubannotation_type:AnnotationType,
4643
}
4744

48-
impl fmt::DisplayforDisplayMark{
49-
fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
50-
matchself.mark_type{
51-
DisplayMarkType::AnnotationStart => f.write_char('/'),
52-
DisplayMarkType::AnnotationThrough => f.write_char('|'),
53-
}
54-
}
55-
}
56-
5745
#[derive(Debug,Clone)]
5846
pubenumDisplayMarkType{
5947
AnnotationThrough,

‎src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ mod display_list;
33
pubmod renderers;
44
pubmod slice;
55
pubmod snippet;
6-
pubmod styles;
76

87
pubuse annotation::{Annotation,AnnotationType,SourceAnnotation};
98
pubuse display_list::DisplayList;

‎src/renderers/ascii_default/mod.rs‎

Lines changed: 73 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
pubmod styles;
22

33
usesuper::RendererasRendererTrait;
4-
usecrate::DisplayList;
4+
usecrate::annotation::AnnotationType;
5+
usecrate::display_list::annotation::Annotation;
56
usecrate::display_list::line::DisplayLine;
7+
usecrate::display_list::line::DisplayMark;
8+
usecrate::display_list::line::DisplayMarkType;
69
usecrate::display_list::line::DisplayRawLine;
710
usecrate::display_list::line::DisplaySourceLine;
8-
usecrate::display_list::annotation::Annotation;
11+
usecrate::DisplayList;
12+
use std::cmp;
913
use std::io::Write;
1014
use std::marker::PhantomData;
1115
use styles::StyleasStyleTrait;
12-
use std::cmp;
1316

1417
fndigits(n:usize) ->usize{
1518
letmut n = n;
@@ -22,14 +25,12 @@ fn digits(n: usize) -> usize {
2225
}
2326

2427
pubstructRenderer<S:StyleTrait>{
25-
style:PhantomData<S>
28+
style:PhantomData<S>,
2629
}
2730

2831
impl<S:StyleTrait>Renderer<S>{
2932
pubfnnew() ->Self{
30-
Renderer{
31-
style:PhantomData
32-
}
33+
Renderer{style:PhantomData}
3334
}
3435

3536
pubfnfmt(&self,w:&mutimplWrite,dl:&DisplayList) -> std::io::Result<()>{
@@ -54,7 +55,13 @@ impl<S: StyleTrait> Renderer<S> {
5455
Ok(())
5556
}
5657

57-
fnfmt_line(&self,w:&mutimplWrite,line:&DisplayLine,lineno_max:Option<usize>,inline_marks_width:usize) -> std::io::Result<()>{
58+
fnfmt_line(
59+
&self,
60+
w:&mutimplWrite,
61+
line:&DisplayLine,
62+
lineno_max:Option<usize>,
63+
inline_marks_width:usize,
64+
) -> std::io::Result<()>{
5865
let lineno_max = lineno_max.unwrap_or(1);
5966
match line{
6067
DisplayLine::Source{
@@ -70,42 +77,46 @@ impl<S: StyleTrait> Renderer<S> {
7077
write!(w," | ")?;
7178
write!(w,"{:>1$}","", inline_marks_width - inline_marks.len())?;
7279
for markin inline_marks{
73-
write!(w,"{}", mark)?;
80+
self.fmt_display_mark(w, mark)?;
7481
}
7582
self.fmt_source_line(w, line)?;
76-
//line.fmt_with_style(w, style)?;
7783
write!(w,"\n")
78-
},
79-
DisplayLine::Raw(l) =>{
80-
self.fmt_raw_line(w, l, lineno_max)
81-
},
84+
}
85+
DisplayLine::Raw(l) =>self.fmt_raw_line(w, l, lineno_max),
8286
}
8387
}
8488

85-
fnfmt_source_line(&self,w:&mutimpl std::io::Write,line:&DisplaySourceLine) -> std::io::Result<()>{
86-
match line{
87-
DisplaySourceLine::Content{ text} =>{
88-
write!(w," {}", text)
89-
}
90-
DisplaySourceLine::Annotation{
91-
annotation,
92-
range:(start, end),
93-
} =>{
94-
let indent =if start ==&0{0}else{ start +1};
95-
write!(w,"{:>1$}","", indent)?;
96-
if start ==&0{
97-
write!(w,"{:_>1$}","^", end - start +1)?;
98-
}else{
99-
write!(w,"{:->1$}","", end - start)?;
100-
}
101-
write!(w," ")?;
102-
self.fmt_annotation(w, annotation)
103-
}
104-
DisplaySourceLine::Empty =>Ok(()),
105-
}
89+
fnfmt_source_line(
90+
&self,
91+
w:&mutimpl std::io::Write,
92+
line:&DisplaySourceLine,
93+
) -> std::io::Result<()>{
94+
match line{
95+
DisplaySourceLine::Content{ text} =>write!(w," {}", text),
96+
DisplaySourceLine::Annotation{
97+
annotation,
98+
range:(start, end),
99+
} =>{
100+
let indent =if start ==&0{0}else{ start +1};
101+
write!(w,"{:>1$}","", indent)?;
102+
if start ==&0{
103+
write!(w,"{:_>1$}","^", end - start +1)?;
104+
}else{
105+
write!(w,"{:->1$}","", end - start)?;
106+
}
107+
write!(w," ")?;
108+
self.fmt_annotation(w, annotation)
109+
}
110+
DisplaySourceLine::Empty =>Ok(()),
111+
}
106112
}
107113

108-
fnfmt_raw_line(&self,w:&mutimpl std::io::Write,line:&DisplayRawLine,lineno_max:usize) -> std::io::Result<()>{
114+
fnfmt_raw_line(
115+
&self,
116+
w:&mutimpl std::io::Write,
117+
line:&DisplayRawLine,
118+
lineno_max:usize,
119+
) -> std::io::Result<()>{
109120
match line{
110121
DisplayRawLine::Origin{ path, pos} =>{
111122
S::fmt(w,format_args!("{:>1$}","", lineno_max))?;
@@ -114,9 +125,9 @@ impl<S: StyleTrait> Renderer<S> {
114125
S::fmt(w,format_args!(":{}", line))?;
115126
}
116127
write!(w,"\n")
117-
},
128+
}
118129
DisplayRawLine::Annotation{ annotation, ..} =>{
119-
S::fmt(w,format_args!("{}",annotation.annotation_type))?;
130+
self.fmt_annotation(w, annotation)?;
120131
ifletSome(id) = annotation.id{
121132
write!(w,"[{}]", id)?;
122133
}
@@ -125,9 +136,30 @@ impl<S: StyleTrait> Renderer<S> {
125136
}
126137
}
127138

128-
129-
fnfmt_annotation(&self,w:&mutimpl std::io::Write,annotation:&Annotation) -> std::io::Result<()>{
130-
write!(w,"{}", annotation.label)
139+
fnfmt_annotation(
140+
&self,
141+
w:&mutimpl std::io::Write,
142+
annotation:&Annotation,
143+
) -> std::io::Result<()>{
144+
match annotation.annotation_type{
145+
AnnotationType::None =>Ok(()),
146+
AnnotationType::Error =>write!(w,"error"),
147+
AnnotationType::Warning =>write!(w,"warning"),
148+
AnnotationType::Info =>write!(w,"info"),
149+
AnnotationType::Note =>write!(w,"note"),
150+
AnnotationType::Help =>write!(w,"help"),
151+
}
152+
}
153+
154+
fnfmt_display_mark(
155+
&self,
156+
w:&mutimpl std::io::Write,
157+
display_mark:&DisplayMark,
158+
) -> std::io::Result<()>{
159+
match display_mark.mark_type{
160+
DisplayMarkType::AnnotationStart =>write!(w,"/"),
161+
DisplayMarkType::AnnotationThrough =>write!(w,"|"),
162+
}
131163
}
132164
}
133165

‎src/renderers/ascii_default/styles/color.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ use super::Style as StyleTrait;
44

55
use std::fmt;
66

7-
pubstructStyle{
8-
}
7+
pubstructStyle{}
98

109
implStyleTraitforStyle{
11-
fnfmt(
12-
w:&mutdyn std::io::Write,
13-
pattern:impl fmt::Display,
14-
) -> std::io::Result<()>{
10+
fnfmt(w:&mutdyn std::io::Write,pattern:impl fmt::Display) -> std::io::Result<()>{
1511
let style =AnsiTermStyle::new().bold();
1612
write!(w,"{}", style.paint(pattern.to_string()))
1713
}

‎src/styles/color.rs‎

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

‎src/styles/mod.rs‎

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

‎src/styles/plain.rs‎

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp