Merge #6173

bors[bot] · kjeremy · web-flow · commit 636b413e142e · 2020-10-08T15:58:48.000Z
6173: Bump rustc_lexer, cfg-if to 1.0 and add new license to check r=kjeremy a=kjeremy



Co-authored-by: kjeremy &lt;kjeremy@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/profile/Cargo.toml b/crates/profile/Cargo.toml
@@ -11,7 +11,7 @@ doctest = false
 
 [dependencies]
 once_cell = "1.3.1"
-cfg-if = "0.1.10"
+cfg-if = "1"
 libc = "0.2.73"
 backtrace = { version = "0.3.44", optional = true }
 
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
@@ -13,7 +13,7 @@ doctest = false
 [dependencies]
 itertools = "0.9.0"
 rowan = "0.10.0"
-rustc_lexer = { version = "681.0.0", package = "rustc-ap-rustc_lexer" }
+rustc_lexer = { version = "682.0.0", package = "rustc-ap-rustc_lexer" }
 rustc-hash = "1.1.0"
 arrayvec = "0.5.1"
 once_cell = "1.3.1"
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
@@ -123,6 +123,7 @@ ISC
 MIT
 MIT / Apache-2.0
 MIT OR Apache-2.0
+MIT OR Zlib OR Apache-2.0
 MIT/Apache-2.0
 Unlicense OR MIT
 Unlicense/MIT
