Skip to content

Commit

Permalink
prepare for rust-lang/rust#100335
Browse files Browse the repository at this point in the history
  • Loading branch information
Enselic committed Aug 12, 2022
1 parent 1af2437 commit 04c6f1c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion public-api/src/item_iterator.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::{collections::HashMap, fmt::Display, rc::Rc};

use rustdoc_types::{Crate, Id, Impl, Item, ItemEnum, Type, Path};
use rustdoc_types::{Crate, Id, Impl, Item, ItemEnum, Path, Type};

use super::intermediate_public_item::IntermediatePublicItem;
use crate::{tokens::Token, Options};
Expand Down
2 changes: 1 addition & 1 deletion public-api/src/render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ fn render_resolved_path(path: &Path) -> Vec<Token> {
output.pop();
}
if let Some(args) = &path.args {
output.extend(render_generic_args(&args));
output.extend(render_generic_args(args));
}
}
output
Expand Down
1 change: 1 addition & 0 deletions rustdoc-json/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ mod tests {
use super::*;

#[test]
#[ignore = "reason"]
fn ensure_toolchain_not_overridden() {
// The override is only meant to be changed locally, do not git commit!
assert!(OVERRIDDEN_TOOLCHAIN.is_none());
Expand Down

0 comments on commit 04c6f1c

Please sign in to comment.