Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f4e4485

Browse files
committedSep 16, 2020
Auto merge of #76771 - Dylan-DPC:rollup-qj4j3ma, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #73955 (deny(unsafe_op_in_unsafe_fn) in libstd/process.rs) - #75146 (Detect overflow in proc_macro_server subspan) - #75304 (Note when a a move/borrow error is caused by a deref coercion) - #75749 (Consolidate some duplicate code in the sys modules.) - #75882 (Use translated variable for test string) - #75886 (Test that bounds checks are elided for [..index] after .position()) - #76048 (Initial support for riscv32gc_unknown_linux_gnu) - #76198 (Make some Ordering methods const) - #76689 (Upgrade to pulldown-cmark 0.8.0) - #76763 (Update cargo) Failed merges: r? `@ghost`
2 parents 9f04c90 + 2e1f012 commit f4e4485

Some content is hidden

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

57 files changed

+564
-973
lines changed
 

‎Cargo.lock

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ dependencies = [
534534
"if_chain",
535535
"itertools 0.9.0",
536536
"lazy_static",
537-
"pulldown-cmark",
537+
"pulldown-cmark 0.7.2",
538538
"quine-mc_cluskey",
539539
"quote",
540540
"regex-syntax",
@@ -1853,7 +1853,7 @@ dependencies = [
18531853
"log",
18541854
"memchr",
18551855
"open",
1856-
"pulldown-cmark",
1856+
"pulldown-cmark 0.7.2",
18571857
"regex",
18581858
"serde",
18591859
"serde_derive",
@@ -2511,6 +2511,17 @@ dependencies = [
25112511
"unicase",
25122512
]
25132513

2514+
[[package]]
2515+
name = "pulldown-cmark"
2516+
version = "0.8.0"
2517+
source = "registry+https://github.com/rust-lang/crates.io-index"
2518+
checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8"
2519+
dependencies = [
2520+
"bitflags",
2521+
"memchr",
2522+
"unicase",
2523+
]
2524+
25142525
[[package]]
25152526
name = "punycode"
25162527
version = "0.4.1"
@@ -4122,7 +4133,7 @@ dependencies = [
41224133
"expect-test",
41234134
"itertools 0.9.0",
41244135
"minifier",
4125-
"pulldown-cmark",
4136+
"pulldown-cmark 0.8.0",
41264137
"rustc-rayon",
41274138
"serde",
41284139
"serde_json",

‎compiler/rustc_expand/src/proc_macro_server.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,12 +584,12 @@ impl server::Literal for Rustc<'_> {
584584

585585
let start = match start {
586586
Bound::Included(lo) => lo,
587-
Bound::Excluded(lo) => lo + 1,
587+
Bound::Excluded(lo) => lo.checked_add(1)?,
588588
Bound::Unbounded => 0,
589589
};
590590

591591
let end = match end {
592-
Bound::Included(hi) => hi + 1,
592+
Bound::Included(hi) => hi.checked_add(1)?,
593593
Bound::Excluded(hi) => hi,
594594
Bound::Unbounded => length,
595595
};

0 commit comments

Comments
 (0)
Please sign in to comment.