mirror of
https://github.com/astral-sh/ruff.git
synced 2025-09-29 21:34:57 +00:00
merge conflicts
This commit is contained in:
parent
502fbeb8da
commit
c73995afaa
1 changed files with 1 additions and 1 deletions
|
@ -207,7 +207,7 @@ impl<'db> ConstraintSet<'db> {
|
||||||
upper.top_materialization(db),
|
upper.top_materialization(db),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
let node = RangeConstraint::new_node(db, lower, typevar, upper);
|
let node = ConstrainedTypeVar::new_node(db, lower, typevar, upper);
|
||||||
Self { node }
|
Self { node }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue