@@ -42,14 +42,21 @@ fn opts() -> Options {
4242/// A unit struct which has the `fmt::Display` trait implemented. When
4343/// formatted, this struct will emit the HTML corresponding to the rendered
4444/// version of the contained markdown string.
45- /// The second parameter is a list of link replacements
45+ ///
46+ /// The second parameter is a list of link replacements.
47+ ///
48+ /// The third is the current list of used header IDs.
49+ ///
50+ /// The fourth is whether to allow the use of explicit error codes in doctest lang strings.
51+ ///
52+ /// The fifth is what default edition to use when parsing doctests (to add a `fn main`).
4653pub struct Markdown < ' a > (
47- pub & ' a str , pub & ' a [ ( String , String ) ] , pub RefCell < & ' a mut IdMap > , pub ErrorCodes ) ;
54+ pub & ' a str , pub & ' a [ ( String , String ) ] , pub RefCell < & ' a mut IdMap > , pub ErrorCodes , pub Edition ) ;
4855/// A unit struct like `Markdown`, that renders the markdown with a
4956/// table of contents.
50- pub struct MarkdownWithToc < ' a > ( pub & ' a str , pub RefCell < & ' a mut IdMap > , pub ErrorCodes ) ;
57+ pub struct MarkdownWithToc < ' a > ( pub & ' a str , pub RefCell < & ' a mut IdMap > , pub ErrorCodes , pub Edition ) ;
5158/// A unit struct like `Markdown`, that renders the markdown escaping HTML tags.
52- pub struct MarkdownHtml < ' a > ( pub & ' a str , pub RefCell < & ' a mut IdMap > , pub ErrorCodes ) ;
59+ pub struct MarkdownHtml < ' a > ( pub & ' a str , pub RefCell < & ' a mut IdMap > , pub ErrorCodes , pub Edition ) ;
5360/// A unit struct like `Markdown`, that renders only the first paragraph.
5461pub struct MarkdownSummaryLine < ' a > ( pub & ' a str , pub & ' a [ ( String , String ) ] ) ;
5562
@@ -146,13 +153,15 @@ thread_local!(pub static PLAYGROUND: RefCell<Option<(Option<String>, String)>> =
146153struct CodeBlocks < ' a , I : Iterator < Item = Event < ' a > > > {
147154 inner : I ,
148155 check_error_codes : ErrorCodes ,
156+ edition : Edition ,
149157}
150158
151159impl < ' a , I : Iterator < Item = Event < ' a > > > CodeBlocks < ' a , I > {
152- fn new ( iter : I , error_codes : ErrorCodes ) -> Self {
160+ fn new ( iter : I , error_codes : ErrorCodes , edition : Edition ) -> Self {
153161 CodeBlocks {
154162 inner : iter,
155163 check_error_codes : error_codes,
164+ edition,
156165 }
157166 }
158167}
@@ -177,6 +186,9 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'a, I> {
177186 return event;
178187 }
179188
189+ let explicit_edition = edition. is_some ( ) ;
190+ let edition = edition. unwrap_or ( self . edition ) ;
191+
180192 let mut origtext = String :: new ( ) ;
181193 for event in & mut self . inner {
182194 match event {
@@ -202,22 +214,14 @@ impl<'a, I: Iterator<Item = Event<'a>>> Iterator for CodeBlocks<'a, I> {
202214 . collect :: < Vec < Cow < ' _ , str > > > ( ) . join ( "\n " ) ;
203215 let krate = krate. as_ref ( ) . map ( |s| & * * s) ;
204216 let ( test, _) = test:: make_test ( & test, krate, false ,
205- & Default :: default ( ) ) ;
217+ & Default :: default ( ) , edition ) ;
206218 let channel = if test. contains ( "#
0 commit comments