Skip to content

Commit 4ec27e4

Browse files
committedNov 20, 2020
Auto merge of rust-lang#79220 - Dylan-DPC:rollup-5bpbygd, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - rust-lang#79119 (Clarify availability of atomic operations) - rust-lang#79123 (Add u128 and i128 integer tests) - rust-lang#79177 (Test drop order for (destructuring) assignments) - rust-lang#79181 (rustdoc: add [src] links to methods on a trait's page) - rust-lang#79183 (Make compiletest testing use the local sysroot) - rust-lang#79185 (expand/resolve: Pre-requisites to "Turn `#[derive]` into a regular macro attribute") - rust-lang#79193 (Revert rust-lang#78969 "Normalize function type during validation") - rust-lang#79194 (Make as{_mut,}_slice on array::IntoIter public) - rust-lang#79204 (Add jyn514 email alias to mailmap) - rust-lang#79212 (Move `rustc_ty` -> `rustc_ty_utils`) - rust-lang#79217 (Add the "memcpy" doc alias to slice::copy_from_slice) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 09c9c9f + 5adc00f commit 4ec27e4

Some content is hidden

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

61 files changed

+633
-736
lines changed
 

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ Jorge Aparicio <japaric@linux.com> <japaricious@gmail.com>
148148
Joseph Martin <pythoner6@gmail.com>
149149
Joseph T. Lyons <JosephTLyons@gmail.com> <josephtlyons@gmail.com>
150150
Joseph T. Lyons <JosephTLyons@gmail.com> <JosephTLyons@users.noreply.github.com>
151+
Joshua Nelson <jyn514@gmail.com> <joshua@yottadb.com>
151152
jumbatm <jumbatm@gmail.com> <30644300+jumbatm@users.noreply.github.com>
152153
Junyoung Cho <june0.cho@samsung.com>
153154
Jyun-Yan You <jyyou.tw@gmail.com> <jyyou@cs.nctu.edu.tw>

‎Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -3802,7 +3802,7 @@ dependencies = [
38023802
"rustc_target",
38033803
"rustc_trait_selection",
38043804
"rustc_traits",
3805-
"rustc_ty",
3805+
"rustc_ty_utils",
38063806
"rustc_typeck",
38073807
"smallvec 1.4.2",
38083808
"tempfile",
@@ -4240,7 +4240,7 @@ dependencies = [
42404240
]
42414241

42424242
[[package]]
4243-
name = "rustc_ty"
4243+
name = "rustc_ty_utils"
42444244
version = "0.0.0"
42454245
dependencies = [
42464246
"rustc_data_structures",

0 commit comments

Comments
 (0)
Please sign in to comment.