Skip to content

Commit 34ea284

Browse files
HocdocBernhard Berger
and
Bernhard Berger
authored
Refactor code-style for Rust 1.65
Closes GH-29. Reviewed-by: Titus Wormer <[email protected]> Co-authored-by: Bernhard Berger <[email protected]>
1 parent 48823f0 commit 34ea284

9 files changed

+12
-12
lines changed

src/construct/gfm_autolink_literal.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ pub fn www_prefix_inside(tokenizer: &mut Tokenizer) -> State {
334334
/// ```
335335
pub fn www_prefix_after(tokenizer: &mut Tokenizer) -> State {
336336
// If there is *anything*, we can link.
337-
if tokenizer.current == None {
337+
if tokenizer.current.is_none() {
338338
State::Nok
339339
} else {
340340
State::Ok

src/construct/gfm_task_list_item_check.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub fn start(tokenizer: &mut Tokenizer) -> State {
6161
.tokenize_state
6262
.document_at_first_paragraph_of_list_item
6363
&& tokenizer.current == Some(b'[')
64-
&& tokenizer.previous == None
64+
&& tokenizer.previous.is_none()
6565
{
6666
tokenizer.enter(Name::GfmTaskListItemCheck);
6767
tokenizer.enter(Name::GfmTaskListItemMarker);
@@ -149,7 +149,7 @@ pub fn after(tokenizer: &mut Tokenizer) -> State {
149149
/// ```
150150
pub fn after_space_or_tab(tokenizer: &mut Tokenizer) -> State {
151151
// End of paragraph, after whitespace, after check, is not okay.
152-
if tokenizer.current == None {
152+
if tokenizer.current.is_none() {
153153
State::Nok
154154
} else {
155155
State::Ok

src/construct/mdx_esm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ fn parse_esm(tokenizer: &mut Tokenizer) -> State {
216216
State::Error(format!("{}:{}: {}", point.line, point.column, message))
217217
}
218218
MdxSignal::Eof(message) => {
219-
if tokenizer.current == None {
219+
if tokenizer.current.is_none() {
220220
State::Error(format!(
221221
"{}:{}: {}",
222222
tokenizer.point.line, tokenizer.point.column, message

src/construct/partial_mdx_jsx.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ fn crash(tokenizer: &Tokenizer, at: &str, expect: &str) -> State {
11191119
"{}:{}: Unexpected {} {}, expected {}",
11201120
tokenizer.point.line,
11211121
tokenizer.point.column,
1122-
format_char_opt(if tokenizer.current == None {
1122+
format_char_opt(if tokenizer.current.is_none() {
11231123
None
11241124
} else {
11251125
char_after_index(tokenizer.parse_state.bytes, tokenizer.point.index)

src/mdast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ impl ToString for Node {
250250
| Node::Image(_)
251251
| Node::ImageReference(_)
252252
| Node::ThematicBreak(_)
253-
| Node::Definition(_) => "".into(),
253+
| Node::Definition(_) => String::new(),
254254
}
255255
}
256256
}

src/subtokenize.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pub fn subtokenize(
9696
debug_assert_eq!(event.kind, Kind::Enter);
9797

9898
// No need to enter linked events again.
99-
if link.previous == None
99+
if link.previous.is_none()
100100
&& (filter.is_none() || &link.content == filter.as_ref().unwrap())
101101
{
102102
// Index into `events` pointing to a chunk.
@@ -148,7 +148,7 @@ pub fn subtokenize(
148148
let link_curr = enter.link.as_ref().expect("expected link");
149149
debug_assert_eq!(enter.kind, Kind::Enter);
150150

151-
if link_curr.previous != None {
151+
if link_curr.previous.is_some() {
152152
tokenizer.define_skip(enter.point.clone());
153153
}
154154

src/to_html.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ fn on_enter_paragraph(context: &mut CompileContext) {
685685
/// Handle [`Enter`][Kind::Enter]:[`Resource`][Name::Resource].
686686
fn on_enter_resource(context: &mut CompileContext) {
687687
context.buffer(); // We can have line endings in the resource, ignore them.
688-
context.media_stack.last_mut().unwrap().destination = Some("".into());
688+
context.media_stack.last_mut().unwrap().destination = Some(String::new());
689689
}
690690

691691
/// Handle [`Enter`][Kind::Enter]:[`ResourceDestinationString`][Name::ResourceDestinationString].

src/to_mdast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1751,7 +1751,7 @@ fn on_mismatch_error(
17511751
if let Some(left) = left {
17521752
format!(" before the end of `{:?}`", left.name)
17531753
} else {
1754-
"".into()
1754+
String::new()
17551755
}
17561756
));
17571757
}

src/util/sanitize_uri.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use alloc::{format, string::String, vec::Vec};
2424
/// * [`micromark-util-sanitize-uri` in `micromark`](https://github.com/micromark/micromark/tree/main/packages/micromark-util-sanitize-uri)
2525
#[must_use]
2626
pub fn sanitize(value: &str) -> String {
27-
encode(&*normalize(value), true)
27+
encode(&normalize(value), true)
2828
}
2929

3030
/// Make a value safe for injection as a URL, and check protocols.
@@ -71,7 +71,7 @@ pub fn sanitize_with_protocols(value: &str, protocols: &[&str]) -> String {
7171
// If it is a protocol, it should be allowed.
7272
let protocol = value[0..colon].to_lowercase();
7373
if !protocols.contains(&protocol.as_str()) {
74-
return "".into();
74+
return String::new();
7575
}
7676
}
7777

0 commit comments

Comments
 (0)