Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/rust
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2beed43911d7e1118331f8d17715d3bab0c72a97
Choose a base ref
..
head repository: rust-lang/rust
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 839b8443059940cb222756bf53305b372ed31f5d
Choose a head ref
Showing with 14 additions and 5 deletions.
  1. +2 −2 tests/rustdoc-json/impls/auto.rs
  2. +2 −2 tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
  3. +10 −1 tests/rustdoc-ui/target-feature-stability.rs
4 changes: 2 additions & 2 deletions tests/rustdoc-json/impls/auto.rs
View file
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ impl Foo {
}

// Testing spans, so all tests below code
//@ is "$.index[*][?(@.docs=='has span')].span.begin" "[13, 0]"
//@ is "$.index[*][?(@.docs=='has span')].span.end" "[15, 1]"
//@ is "$.index[*][?(@.docs=='has span')].span.begin" "[22, 0]"
//@ is "$.index[*][?(@.docs=='has span')].span.end" "[24, 1]"
// FIXME: this doesn't work due to https://github.com/freestrings/jsonpath/issues/91
// is "$.index[*][?(@.inner.impl.is_synthetic==true)].span" null
pub struct Foo;
4 changes: 2 additions & 2 deletions tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: unclosed quote string `"`
--> $DIR/custom_code_classes_in_docs-warning3.rs:11:1
--> $DIR/custom_code_classes_in_docs-warning3.rs:20:1
|
LL | / /// ```{class="}
LL | | /// main;
@@ -17,7 +17,7 @@ LL | #![deny(warnings)]
= note: `#[deny(rustdoc::invalid_codeblock_attributes)]` implied by `#[deny(warnings)]`

error: unclosed quote string `"`
--> $DIR/custom_code_classes_in_docs-warning3.rs:11:1
--> $DIR/custom_code_classes_in_docs-warning3.rs:20:1
|
LL | / /// ```{class="}
LL | | /// main;
11 changes: 10 additions & 1 deletion tests/rustdoc-ui/target-feature-stability.rs
View file
Original file line number Diff line number Diff line change
@@ -12,10 +12,19 @@
#![crate_type = "lib"]
#![feature(no_core, lang_items)]
#![feature(arm_target_feature)]
#![feature(const_trait_impl)]
#![no_core]

#[lang = "pointeesized"]
pub trait PointeeSized {}

#[lang = "metasized"]
#[const_trait]
pub trait MetaSized: PointeeSized {}

#[lang = "sized"]
pub trait Sized {}
#[const_trait]
pub trait Sized: MetaSized {}

// `fp-armv8` is "forbidden" on aarch64 as we tie it to `neon`.
#[target_feature(enable = "fp-armv8")]