Skip to content

Commit 2e2f860

Browse files
committed
Fix ambiguity of glob import with matches! now in the standard library
``` error[E0659]: `matches` is ambiguous (glob import vs any other name from outer scope during import/macro resolution) --> html5ever/src/tree_builder/tag_sets.rs:109:5 | 109 | matches!( | ^^^^^^^ ambiguous name | = note: `matches` could refer to a macro from prelude note: `matches` could also refer to the macro imported here --> html5ever/src/tree_builder/tag_sets.rs:13:5 | 13 | use mac::*; | ^^^^^^ = help: consider adding an explicit import of `matches` to disambiguate = help: or use `self::matches` to refer to this macro unambiguously error: aborting due to 2 previous errors ```
1 parent fbe0779 commit 2e2f860

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

html5ever/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "html5ever"
4-
version = "0.25.0"
4+
version = "0.25.1"
55
authors = [ "The html5ever Project Developers" ]
66
license = "MIT / Apache-2.0"
77
repository = "https://github.com/servo/html5ever"

html5ever/src/tree_builder/tag_sets.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//! Various sets of HTML tag names, and macros for declaring them.
1111
1212
use crate::ExpandedName;
13-
use mac::*;
13+
use mac::{matches, _tt_as_expr_hack};
1414
use markup5ever::{expanded_name, local_name, namespace_prefix, namespace_url, ns};
1515

1616
macro_rules! declare_tag_set_impl ( ($param:ident, $b:ident, $supr:ident, $($tag:tt)+) => (

html5ever/src/util/str.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// option. This file may not be copied, modified, or distributed
88
// except according to those terms.
99

10-
use mac::*;
10+
use mac::{matches, _tt_as_expr_hack};
1111
use std::fmt;
1212

1313
pub fn to_escaped_string<T: fmt::Debug>(x: &T) -> String {

xml5ever/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22

33
name = "xml5ever"
4-
version = "0.16.0"
4+
version = "0.16.1"
55
authors = ["The xml5ever project developers"]
66
license = "MIT / Apache-2.0"
77
repository = "https://github.com/servo/html5ever"

xml5ever/src/tree_builder/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
mod types;
1111

1212
use log::{debug, warn};
13-
use mac::*;
13+
use mac::{matches, _tt_as_expr_hack, unwrap_or_return};
1414
use markup5ever::{local_name, namespace_prefix, namespace_url, ns};
1515
use std::borrow::Cow;
1616
use std::borrow::Cow::Borrowed;

xml5ever/src/util/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// option. This file may not be copied, modified, or distributed
88
// except according to those terms.
99

10-
use mac::*;
10+
use mac::{matches, _tt_as_expr_hack};
1111

1212
/// Is the character an ASCII alphanumeric character?
1313
pub fn is_ascii_alnum(c: char) -> bool {

0 commit comments

Comments
 (0)