Skip to content

Commit cfaa670

Browse files
authored
Merge branch 'rust-lang:master' into feat/filter-blob-none
2 parents c3b5211 + ed3365e commit cfaa670

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

ci/linkcheck.sh

+6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ if [ "$GITHUB_EVENT_NAME" = "schedule" ] ; then # running in scheduled job
1414

1515
echo "Doing full link check."
1616
elif [ "$GITHUB_EVENT_NAME" = "pull_request" ] ; then # running in PR CI build
17+
echo "*** WARNING: linkcheck temporarily disabled due to bugs ***"
18+
exit 0
19+
1720
if [ -z "$BASE_SHA" ]; then
1821
echo "error: unexpected state: BASE_SHA must be non-empty in CI"
1922
exit 1
@@ -25,6 +28,9 @@ elif [ "$GITHUB_EVENT_NAME" = "pull_request" ] ; then # running in PR CI build
2528

2629
echo "Checking files changed since $BASE_SHA: $CHANGED_FILES"
2730
else # running locally
31+
echo "*** WARNING: linkcheck temporarily disabled due to bugs ***"
32+
exit 0
33+
2834
COMMIT_RANGE=master...
2935
CHANGED_FILES=$(git diff --name-only $COMMIT_RANGE | sed 's#^src/##' | tr '\n' ' ')
3036
FLAGS="-f $CHANGED_FILES"

src/SUMMARY.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194

195195
- [Prologue](./part-5-intro.md)
196196
- [MIR optimizations](./mir/optimizations.md)
197-
- [Debugging](./mir/debugging.md)
197+
- [Debugging MIR](./mir/debugging.md)
198198
- [Constant evaluation](./const-eval.md)
199199
- [Interpreter](./const-eval/interpret.md)
200200
- [Monomorphization](./backend/monomorph.md)

src/mir/dataflow.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,18 @@ value will be `true`, since our analysis is done as soon as we determine that
127127
`transmute` has been called. Our join operator will just be the boolean OR (`||`)
128128
operator. We use OR and not AND because of this case:
129129

130-
```
130+
```rust
131+
# unsafe fn example(some_cond: bool) {
131132
let x = if some_cond {
132-
std::mem::transmute<i32, u32>(0_i32); // transmute was called!
133+
std::mem::transmute::<i32, u32>(0_i32) // transmute was called!
133134
} else {
134-
1_u32; // transmute was not called
135+
1_u32 // transmute was not called
135136
};
136137

137138
// Has transmute been called by this point? We conservatively approximate that
138139
// as yes, and that is why we use the OR operator.
139140
println!("x: {}", x);
141+
# }
140142
```
141143

142144
## Inspecting the Results of a Dataflow Analysis
@@ -219,7 +221,7 @@ the example below:
219221

220222
["gen-kill" problems]: https://en.wikipedia.org/wiki/Data-flow_analysis#Bit_vector_problems
221223
[*Static Program Analysis*]: https://cs.au.dk/~amoeller/spa/
222-
[Debugging MIR]: ./debugging.html
224+
[Debugging MIR]: ./debugging.md
223225
[`AnalysisDomain`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir_dataflow/trait.AnalysisDomain.html
224226
[`Analysis`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir_dataflow/trait.Analysis.html
225227
[`Engine`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_mir_dataflow/struct.Engine.html

0 commit comments

Comments
 (0)