Skip to content

Commit f7801d6

Browse files
committedNov 5, 2020
Auto merge of #78767 - m-ou-se:rollup-eu5wgxl, r=m-ou-se
Rollup of 15 pull requests Successful merges: - #76718 (Move Vec UI tests to unit tests when possible) - #78093 (Clean up docs for 'as' keyword) - #78425 (Move f64::NAN ui tests into `library`) - #78465 (Change as_str → to_string in proc_macro::Ident::span() docs) - #78584 (Add keyboard handling to the theme picker menu) - #78716 (Array trait impl comment/doc fixes) - #78727 ((rustdoc) fix test for trait impl display) - #78733 (fix a couple of clippy warnings:) - #78735 (Simplify the implementation of `get_mut` (no unsafe)) - #78738 (Move range in ui test to ops test in library/core) - #78739 (Fix ICE on type error in async function) - #78742 (make intern_const_alloc_recursive return error) - #78756 (Update cargo) - #78757 (Improve and clean up some intra-doc links) - #78758 (Fixed typo in comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
·
1.90.01.49.0
2 parents 8c20701 + 8416e13 commit f7801d6

File tree

51 files changed

+503
-367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+503
-367
lines changed
 

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ dependencies = [
9191

9292
[[package]]
9393
name = "anyhow"
94-
version = "1.0.32"
94+
version = "1.0.34"
9595
source = "registry+https://github.com/rust-lang/crates.io-index"
96-
checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b"
96+
checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7"
9797

9898
[[package]]
9999
name = "arc-swap"

‎compiler/rustc_ast/src/attr/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ pub fn list_contains_name(items: &[NestedMetaItem], name: Symbol) -> bool {
360360
impl MetaItem {
361361
fn token_trees_and_spacings(&self) -> Vec<TreeAndSpacing> {
362362
let mut idents = vec![];
363-
let mut last_pos = BytePos(0 as u32);
363+
let mut last_pos = BytePos(0_u32);
364364
for (i, segment) in self.path.segments.iter().enumerate() {
365365
let is_first = i == 0;
366366
if !is_first {

0 commit comments

Comments
 (0)
Please sign in to comment.