@@ -7,11 +7,10 @@ use anyhow::{Result, anyhow};
77use clap:: { Args , Parser , Subcommand } ;
88use fs_extra:: dir:: { CopyOptions , DirOptions , copy, get_dir_content2} ;
99use log:: warn;
10- use mdbook:: {
11- MDBook , Renderer ,
12- preprocess:: { CmdPreprocessor , Preprocessor } ,
13- renderer:: RenderContext ,
14- } ;
10+ use mdbook_core:: MDBOOK_VERSION ;
11+ use mdbook_driver:: MDBook ;
12+ use mdbook_preprocessor:: { Preprocessor , parse_input} ;
13+ use mdbook_renderer:: { RenderContext , Renderer } ;
1514use mdbook_trunk:: { TrunkPreprocessor , TrunkRenderer } ;
1615use peekread:: { BufPeekReader , PeekRead } ;
1716use semver:: { Version , VersionReq } ;
@@ -124,23 +123,23 @@ fn handle_supports(
124123 preprocessor : & dyn Preprocessor ,
125124 SupportsArgs { renderer } : & SupportsArgs ,
126125) -> Result < ( ) > {
127- match preprocessor. supports_renderer ( renderer) {
126+ match preprocessor. supports_renderer ( renderer) ? {
128127 true => Ok ( ( ) ) ,
129128 false => Err ( anyhow ! ( "Renderer `{renderer}` is not supported." ) ) ,
130129 }
131130}
132131
133132fn handle_preprocessing < R : Read > ( preprocessor : & dyn Preprocessor , reader : R ) -> Result < ( ) > {
134- let ( ctx, book) = CmdPreprocessor :: parse_input ( reader) ?;
133+ let ( ctx, book) = parse_input ( reader) ?;
135134
136135 let book_version = Version :: parse ( & ctx. mdbook_version ) ?;
137- let version_req = VersionReq :: parse ( mdbook :: MDBOOK_VERSION ) ?;
136+ let version_req = VersionReq :: parse ( MDBOOK_VERSION ) ?;
138137
139138 if !version_req. matches ( & book_version) {
140139 warn ! (
141140 "The {} plugin was built against version {} of mdbook, but we're being called from version {}" ,
142141 preprocessor. name( ) ,
143- mdbook :: MDBOOK_VERSION ,
142+ MDBOOK_VERSION ,
144143 ctx. mdbook_version
145144 ) ;
146145 }
@@ -155,13 +154,13 @@ fn handle_renderer<R: Read>(renderer: &dyn Renderer, reader: R) -> Result<()> {
155154 let ctx = RenderContext :: from_json ( reader) . unwrap ( ) ;
156155
157156 let book_version = Version :: parse ( & ctx. version ) ?;
158- let version_req = VersionReq :: parse ( mdbook :: MDBOOK_VERSION ) ?;
157+ let version_req = VersionReq :: parse ( MDBOOK_VERSION ) ?;
159158
160159 if !version_req. matches ( & book_version) {
161160 warn ! (
162161 "The {} plugin was built against version {} of mdbook, but we're being called from version {}" ,
163162 renderer. name( ) ,
164- mdbook :: MDBOOK_VERSION ,
163+ MDBOOK_VERSION ,
165164 ctx. version
166165 ) ;
167166 }
0 commit comments