Commit 2ba2ec4

committed

refactor(display_list): Take a reference to StyleSheet

1 parent 113878a commit 2ba2ec4Copy full SHA for 2ba2ec4

File tree

2 files changed

+11

-11

lines changed

src
- display_list
  - mod.rs
- renderer
  - mod.rs

2 files changed

+11

-11

lines changed

`‎src/display_list/mod.rs‎`

Lines changed: 10 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ use crate::renderer::{stylesheet::Stylesheet, Margin, Style};`
`40`	`40`	`/// List of lines to be displayed.`
`41`	`41`	`pub(crate) struct DisplayList<'a> {`
`42`	`42`	`pub body: Vec<DisplayLine<'a>>,`
`43`		`- pub stylesheet: Stylesheet,`
	`43`	`+ pub stylesheet: &'aStylesheet,`
`44`	`44`	`pub anonymized_line_numbers: bool,`
`45`	`45`	`pub margin: Option<Margin>,`
`46`	`46`	`}`
`@@ -108,7 +108,7 @@ impl<'a> DisplayList<'a> {`
`108`	`108`	`footer,`
`109`	`109`	`slices,`
`110`	`110`	`}: snippet::Snippet<'a>,`
`111`		`- stylesheet: Stylesheet,`
	`111`	`+ stylesheet: &'aStylesheet,`
`112`	`112`	`anonymized_line_numbers: bool,`
`113`	`113`	`margin: Option<Margin>,`
`114`	`114`	`) -> DisplayList<'a> {`
`@@ -1217,7 +1217,7 @@ mod tests {`
`1217`	`1217`	`fn from_display_lines(lines: Vec<DisplayLine<'_>>) -> DisplayList<'_> {`
`1218`	`1218`	`DisplayList {`
`1219`	`1219`	`body: lines,`
`1220`		`- stylesheet: STYLESHEET,`
	`1220`	`+ stylesheet: &STYLESHEET,`
`1221`	`1221`	`anonymized_line_numbers: false,`
`1222`	`1222`	`margin: None,`
`1223`	`1223`	`}`
`@@ -1246,7 +1246,7 @@ mod tests {`
`1246`	`1246`	`source_aligned: false,`
`1247`	`1247`	`continuation: false,`
`1248`	`1248`	`})]);`
`1249`		`- assert_eq!(DisplayList::new(input, STYLESHEET, false, None), output);`
	`1249`	`+ assert_eq!(DisplayList::new(input, &STYLESHEET, false, None), output);`
`1250`	`1250`	`}`
`1251`	`1251`
`1252`	`1252`	`#[test]`
`@@ -1293,7 +1293,7 @@ mod tests {`
`1293`	`1293`	`line: DisplaySourceLine::Empty,`
`1294`	`1294`	`},`
`1295`	`1295`	`]);`
`1296`		`- assert_eq!(DisplayList::new(input, STYLESHEET, false, None), output);`
	`1296`	`+ assert_eq!(DisplayList::new(input, &STYLESHEET, false, None), output);`
`1297`	`1297`	`}`
`1298`	`1298`
`1299`	`1299`	`#[test]`
`@@ -1370,7 +1370,7 @@ mod tests {`
`1370`	`1370`	`line: DisplaySourceLine::Empty,`
`1371`	`1371`	`},`
`1372`	`1372`	`]);`
`1373`		`- assert_eq!(DisplayList::new(input, STYLESHEET, false, None), output);`
	`1373`	`+ assert_eq!(DisplayList::new(input, &STYLESHEET, false, None), output);`
`1374`	`1374`	`}`
`1375`	`1375`
`1376`	`1376`	`#[test]`
`@@ -1440,7 +1440,7 @@ mod tests {`
`1440`	`1440`	`line: DisplaySourceLine::Empty,`
`1441`	`1441`	`},`
`1442`	`1442`	`]);`
`1443`		`- assert_eq!(DisplayList::new(input, STYLESHEET, false, None), output);`
	`1443`	`+ assert_eq!(DisplayList::new(input, &STYLESHEET, false, None), output);`
`1444`	`1444`	`}`
`1445`	`1445`
`1446`	`1446`	`#[test]`
`@@ -1466,7 +1466,7 @@ mod tests {`
`1466`	`1466`	`source_aligned: true,`
`1467`	`1467`	`continuation: false,`
`1468`	`1468`	`})]);`
`1469`		`- assert_eq!(DisplayList::new(input, STYLESHEET, false, None), output);`
	`1469`	`+ assert_eq!(DisplayList::new(input, &STYLESHEET, false, None), output);`
`1470`	`1470`	`}`
`1471`	`1471`
`1472`	`1472`	`#[test]`
`@@ -1489,7 +1489,7 @@ mod tests {`
`1489`	`1489`	`fold: false,`
`1490`	`1490`	`}],`
`1491`	`1491`	`};`
`1492`		`- let _ = DisplayList::new(input, STYLESHEET, false, None);`
	`1492`	`+ let _ = DisplayList::new(input, &STYLESHEET, false, None);`
`1493`	`1493`	`}`
`1494`	`1494`
`1495`	`1495`	`#[test]`
`@@ -1577,7 +1577,7 @@ mod tests {`
`1577`	`1577`	`},`
`1578`	`1578`	`]);`
`1579`	`1579`	`assert_eq!(`
`1580`		`- DisplayList::new(snippets, STYLESHEET, false, None),`
	`1580`	`+ DisplayList::new(snippets, &STYLESHEET, false, None),`
`1581`	`1581`	`expected`
`1582`	`1582`	`);`
`1583`	`1583`	`}`

`‎src/renderer/mod.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ impl Renderer {`
`95`	`95`	`pub fn render<'a>(&'a self, snippet: Snippet<'a>) -> impl Display + 'a {`
`96`	`96`	`DisplayList::new(`
`97`	`97`	`snippet,`
`98`		`- self.stylesheet,`
	`98`	`+ &self.stylesheet,`
`99`	`99`	`self.anonymized_line_numbers,`
`100`	`100`	`self.margin,`
`101`	`101`	`)`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2ba2ec4

File tree

2 files changed

2 files changed

`‎src/display_list/mod.rs‎`

`‎src/renderer/mod.rs‎`

0 commit comments